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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 09:43:02 +0000 (Thu, 27 Dec 2007)
New Revision: 1132

Modified:
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
Remove the need for a flag directory on disk.

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:39:40 UTC (rev 1131)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-12-27 09:43:02 UTC (rev 1132)
@@ -119,18 +119,18 @@
     # Not for loopback!
     [ "$IFACE" != "lo" ] || exit 0
 
-   # Wait until all auto interfaces are up before attemting to mount
-   # network file systems.
+    # 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
-	    msg="if-up.d/mountnfs[$IFACE]: waiting for interface $i before NFS mounts"
-	    log_warning_msg "$msg"
-	    mkdir /var/run/network/mountnfs_earlyexit 2> /dev/null
+	    waitforif="$i $waitforif"
 	fi
     done
-    if [ -d /var/run/network/mountnfs_earlyexit ]; then
-	rmdir /var/run/network/mountnfs_earlyexit 2>/dev/null
+    if [ "$waitforif" ]; then
+	msg="if-up.d/mountnfs[$IFACE]: waiting for interface(s) $waitforif before NFS mounts"
+	log_warning_msg "$msg"
 	exit 0
     fi