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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-10 21:20:18 +0000 (Sat, 10 Dec 2005)
New Revision: 359

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
Log:
Fix #339023

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-02 15:29:26 UTC (rev 358)
+++ sysvinit/trunk/debian/changelog	2005-12-10 21:20:18 UTC (rev 359)
@@ -29,6 +29,8 @@
   * bootmisc.sh: Shorten motd header  (Closes: #340017)
   * bootmisc.sh: Rotate dmesg log with savelog (Closes: #237074)
     and chgrp adm.
+  * umountroot: Change mount command in order to exclude bind mounts of
+    the root directory  (Closes: #339023)
   * Replace /etc/rc1.d/20single by /etc/rc1.d/S30killprocs and
     /etc/rc1.d/S99single so that packages can insert scripts to do
     things between the "killall5" in the former and the "exec init -t1 S"

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-12-02 15:29:26 UTC (rev 358)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-12-10 21:20:18 UTC (rev 359)
@@ -15,7 +15,10 @@
 
 do_stop () {
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Mounting root filesystem read-only"
-	mount -n -o remount,ro /
+	# This:
+	#     mount -n -o remount,ro /
+	# will act on a bind mount of / if there is one.  See #339023.
+	mount -n -o remount,ro -t dummy dummy /
 	[ "$VERBOSE" != no ] && log_action_end_msg $?
 }