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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-18 20:15:16 +0000 (Fri, 18 Sep 2009)
New Revision: 1781

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/etc/network/if-up.d/mountnfs
Log:
Change if-up.d/mountnfs to not claim to wait for the last network
interface when there are no network file systems listed in
/etc/fstab (Closes: #512237, 481028).  Patch from Adrian Bridgett.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-09-14 23:39:17 UTC (rev 1780)
+++ sysvinit/trunk/debian/changelog	2009-09-18 20:15:16 UTC (rev 1781)
@@ -1,3 +1,11 @@
+sysvinit (2.87dsf-7) UNRELEASED; urgency=low
+
+  * Change if-up.d/mountnfs to not claim to wait for the last network
+    interface when there are no network file systems listed in
+    /etc/fstab (Closes: #512237, 481028).  Patch from Adrian Bridgett.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 18 Sep 2009 22:12:48 +0200
+
 sysvinit (2.87dsf-6) unstable; urgency=low
 
   * Correct code in sysv-rc postinst to avoid failing to install when no

Modified: sysvinit/trunk/debian/src/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/src/initscripts/etc/network/if-up.d/mountnfs	2009-09-14 23:39:17 UTC (rev 1780)
+++ sysvinit/trunk/debian/src/initscripts/etc/network/if-up.d/mountnfs	2009-09-18 20:15:16 UTC (rev 1781)
@@ -13,7 +13,7 @@
 . /lib/lsb/init-functions
 . /lib/init/mount-functions.sh
 
-do_start() {
+set_env() {
 	[ -f /etc/fstab ] || return
 	#
 	# Read through fstab line by line. If it is NFS, set the flag
@@ -90,7 +90,9 @@
 	done
 
 	exec 0<&9 9<&-
+}
 
+do_start() {
 	#
 	# Initialize nfs-common (which starts rpc.statd, rpc.gssd
 	# and/or rpc.idmapd, and loads the right kernel modules if
@@ -132,6 +134,13 @@
 
 # Using 'no !=' instead of 'yes =' to make sure async nfs mounting is
 # the default even without a value in /etc/default/rcS
+set_env
+# Exit imediately and do not claim to wait for the last interface if
+# no network file systems are listed in /etc/fstab.
+if [ "$start_nfs" = "no" ] && [ ! "$NETFS" ] && [ ! "$NETDEV" ]; then
+  exit 0
+fi
+
 if [ no != "$ASYNCMOUNTNFS" ]; then
     # Not for loopback!
     [ "$IFACE" != "lo" ] || exit 0