[Pkg-sysvinit-commits] r1217 - in sysvinit/trunk/debian: . initscripts/etc/network/if-up.d

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-16 09:02:42 +0000 (Wed, 16 Jan 2008)
New Revision: 1217

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
  * Handle both trailing space after interface names and multiple
    interfaces on one auto line in /etc/network/interfaces when
    checking if the last interface has been enabled for NFS mounting
    (Closes: #460463, 461011).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-13 09:35:25 UTC (rev 1216)
+++ sysvinit/trunk/debian/changelog	2008-01-16 09:02:42 UTC (rev 1217)
@@ -4,6 +4,10 @@
     query instead of reading /var/lib/dpkg/status directly.
   * Do not allow "make -C debian/startpar clean" to fail, it should
     work every time.
+  * Handle both trailing space after interface names and multiple
+    interfaces on one auto line in /etc/network/interfaces when
+    checking if the last interface has been enabled for NFS mounting
+    (Closes: #460463, 461011).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 13 Jan 2008 10:27:05 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2008-01-13 09:35:25 UTC (rev 1216)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2008-01-16 09:02:42 UTC (rev 1217)
@@ -115,7 +115,8 @@
 
 exit_unless_last_interface() {
     grep "^[:space:]*auto" /etc/network/interfaces  | \
-	sed -e 's/[ \t]*auto[ \t]*//;s/[ \t]//g' | while read i; do
+	sed -e 's/[ \t]*auto[ \t]*//;s/[ \t]*$//;s/[ \t]/\n/g' | \
+	while read i; do echo $i; done
 	if [ `grep -c $i /etc/network/run/ifstate` -eq "0" ]; then
 	    msg="if-up.d/mountnfs[$IFACE]: waiting for interface $i before doing NFS mounts"
 	    log_warning_msg "$msg"