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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-03-10 18:59:08 +0000 (Fri, 10 Mar 2006)
New Revision: 763

Modified:
   sysvinit/trunk/debian/NOTES
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
Log:
Fix #356226

Modified: sysvinit/trunk/debian/NOTES
===================================================================
--- sysvinit/trunk/debian/NOTES	2006-03-10 18:44:21 UTC (rev 762)
+++ sysvinit/trunk/debian/NOTES	2006-03-10 18:59:08 UTC (rev 763)
@@ -99,6 +99,9 @@
   "-e" option was added.  Sarge satisfies this requirement so this 
   dependency could be dropped.  We can drop it after etch releases;
   then both stable and oldstable will satisfy the requirement.
+* initscripts needs to Depend on debianutils >= 2.12.0 until etch has
+  been released so that which can be assumed to be in /bin (rather than
+  in /usr/bin, as it was before, including in 2.8.4 in sarge)
 * initscripts Conflicts with and Replaces mdutils which was last seen in
   potato.  Can disappear after etch.
 

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-03-10 18:44:21 UTC (rev 762)
+++ sysvinit/trunk/debian/changelog	2006-03-10 18:59:08 UTC (rev 763)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-13~7) unstable; urgency=low
+sysvinit (2.86.ds1-13~8) unstable; urgency=low
 
   [ Thomas Hood ]
   * umountroot: Tweak handling of error messages from mount
@@ -13,6 +13,7 @@
   * Add NEWS.Debian with entry for 2.86.ds1-10 which reports the
     replacement of the bootclean.sh function library by the
     bootclean initscript.  (Closes: #355746)
+  * umountfs: Unmount even if sort not available  (Closes: #356226)
 
   [ Petter Reinholdtsen ]
   * Silence init.d/hostname.sh when VERBOSE=no.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-03-10 18:44:21 UTC (rev 762)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-03-10 18:59:08 UTC (rev 763)
@@ -16,10 +16,22 @@
 
 umask 022
 
+# List all mounts, sorting to ensure that deeper mount points
+# are unmounted before shallower ones
+list_mounts() {
+	if which sort >/dev/null 2>&1
+	then
+		LC_ALL=C sort -r -k 2 /proc/mounts
+	else
+		# On systems with /usr on NFS, sort may not be around any more
+		# so just use cat
+		cat /proc/mounts
+	fi
+}
+
+
 do_stop () {
-	# List all mounts, sorting to ensure that deeper mount points
-	# are unmounted before shallower ones
-	LC_ALL=C sort -r -k 2 /proc/mounts | 
+	list_mounts | 
 	(
 		REG_MTPTS=""
 		TMPFS_MTPTS=""