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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 09:50:00 +0000 (Thu, 27 Dec 2007)
New Revision: 1133

Modified:
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
Undo variable passing change, as it did not work.  Add comment to explain why it did not work.

Modified: sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-12-27 09:43:02 UTC (rev 1132)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-12-27 09:50:00 UTC (rev 1133)
@@ -121,16 +121,17 @@
 
     # Wait until all auto interfaces are up before attemting to mount
     # network file systems.
-    waitforif=""
     grep "^[:space:]*auto" /etc/network/interfaces  | \
 	sed -e 's/[ \t]*auto[ \t]*//;s/[ \t]/\n/g' | while read i; do
 	if [ `grep -c $i /etc/network/run/ifstate` -eq "0" ]; then
-	    waitforif="$i $waitforif"
+	    msg="if-up.d/mountnfs[$IFACE]: waiting for interface $i before NFS mounts"
+	    log_warning_msg "$msg"
+	    # Can not pass this as a variable because of the while subshell
+	    mkdir /var/run/network/mountnfs_earlyexit 2> /dev/null
 	fi
     done
-    if [ "$waitforif" ]; then
-	msg="if-up.d/mountnfs[$IFACE]: waiting for interface(s) $waitforif before NFS mounts"
-	log_warning_msg "$msg"
+    if [ -d /var/run/network/mountnfs_earlyexit ]; then
+	rmdir /var/run/network/mountnfs_earlyexit 2>/dev/null
 	exit 0
     fi