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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-17 23:07:40 +0000 (Sat, 17 Dec 2005)
New Revision: 400

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
Use /proc/mounts

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-17 23:04:26 UTC (rev 399)
+++ sysvinit/trunk/debian/changelog	2005-12-17 23:07:40 UTC (rev 400)
@@ -1,8 +1,11 @@
 sysvinit (2.86.ds1-8~1) unstable; urgency=low
 
+  [ Petter Reinholdtsen ]
+  * Upload to unstable  (Closes: #341075)
+
   [ Thomas Hood ]
-  * Upload to unstable  (Closes: #341075)
   * Last release also closes: #338736, #342160, #342744
+  * Use /proc/mounts instead of /etc/mtab when unmounting  (Closes: #338801)
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Sun, 18 Dec 2005 00:00:58 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-12-17 23:04:26 UTC (rev 399)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-12-17 23:07:40 UTC (rev 400)
@@ -33,7 +33,7 @@
 	# Umount all filesystems except root and the virtual ones
 	log_action_begin_msg "Unmounting local filesystems"
 	# List all mounts, deepest mount point first
-	LANG=C sort -r -k 2 /etc/mtab | 
+	LANG=C sort -r -k 2 /proc/mounts | 
 	(
 		DIRS=""
 		while read DEV DIR TYPE REST ; do

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-12-17 23:04:26 UTC (rev 399)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-12-17 23:07:40 UTC (rev 400)
@@ -65,7 +65,7 @@
 		then
 			umount $FLAGS $DIRS
 		fi
-	) </etc/mtab
+	) </proc/mounts
 
 	log_action_end_msg 0
 }