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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 09:33:49 +0000 (Thu, 27 Dec 2007)
New Revision: 1130

Modified:
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
Move interface waiting code until after the check for the loopback device, to avoid getting the warning on hosts with only lo and eth0.

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:18:02 UTC (rev 1129)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-12-27 09:33:49 UTC (rev 1130)
@@ -113,27 +113,27 @@
 	post_mountall
 }
 
-# Wait until all auto interfaces are up before attemting to mount
-# network file systems.
-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
-    fi
-done
-if [ -d /var/run/network/mountnfs_earlyexit ]; then
-    rmdir /var/run/network/mountnfs_earlyexit 2>/dev/null
-    exit 0
-fi
-
 # Using 'no !=' instead of 'yes =' to make sure async nfs mounting is
 # the default even without a value in /etc/default/rcS
 if [ no != "$ASYNCMOUNTNFS" ]; then
     # Not for loopback!
     [ "$IFACE" != "lo" ] || exit 0
 
+   # Wait until all auto interfaces are up before attemting to mount
+   # network file systems.
+    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
+	fi
+    done
+    if [ -d /var/run/network/mountnfs_earlyexit ]; then
+	rmdir /var/run/network/mountnfs_earlyexit 2>/dev/null
+	exit 0
+    fi
+
     # Lock around this otherwise insanity may occur
     mkdir /var/run/network          2>/dev/null || true