[Pkg-sysvinit-commits] r829 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 14:24:59 +0000 (Tue, 05 Sep 2006)
New Revision: 829

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
  * Umount netdev file systems in umountnfs.sh. (Closes: #383124)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 14:22:48 UTC (rev 828)
+++ sysvinit/trunk/debian/changelog	2006-09-05 14:24:59 UTC (rev 829)
@@ -28,6 +28,7 @@
   * Do not try to mount netdev file systems in mountall.sh. (Closes: #383073)
   * Mount netdev file systems when the network interfaces are enabled.
     (Closes: #383123)
+  * Umount netdev file systems in umountnfs.sh. (Closes: #383124)
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-05 14:22:48 UTC (rev 828)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-05 14:24:59 UTC (rev 829)
@@ -45,7 +45,7 @@
 	exec 9<&0 </proc/mounts
 
 	DIRS=""
-	while read DEV MTPT FSTYPE REST
+	while read DEV MTPT FSTYPE OPTS REST
 	do
 		case "$MTPT" in
 		  /|/proc|/dev|/dev/pts|/dev/shm|/proc/*|/sys)
@@ -60,6 +60,11 @@
 			DIRS="$MTPT $DIRS"
 			;;
 		esac
+		case "$OPTS" in
+		  _netdev|*,_netdev|_netdev,*|*,_netdev,*)
+			DIRS="$MTPT $DIRS"
+			;;
+		esac
 	done
 
 	exec 0<&9 9<&-