Use killall5 again so we can cleanly remount / readonly, #168977

and #177689.

ChangeLog

@@ -4,6 +4,8 @@
   30 May 2007; Roy Marples <uberlord@gentoo.org>:
 
     Only call systohw in clock when we don't have adjfile or we aren't UTC.
+    Use killall5 again so we can cleanly remount / readonly, #168977
+    and #177689.
 
 * baselayout-2.0.0_alpha3 (14 May 2007)
 

init.d/halt.sh

@@ -14,6 +14,12 @@ fi
 stop_addon devfs
 stop_addon udev
 
+# Really kill things off before unmounting
+if [ -x /sbin/killall5 ] ; then
+	killall5 -15
+	killall5 -9
+fi
+
 # Flush all pending disk writes now
 sync ; sync
 

sh/rc-mount.sh

@@ -54,7 +54,7 @@ do_unmount() {
 			if [ ${retry} -le 0 ] ; then
 				case "${cmd}" in
 					umount*)
-						LC_ALL=C ${cmd} ${extra_opts} "${mnt}" || retry=-999
+						LC_ALL=C ${cmd} -f "${mnt}" || retry=-999
 						;;
 					*)
 						retry=-999