diff options
| author | Roy Marples <roy@marples.name> | 2007-05-30 22:30:54 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-05-30 22:30:54 +0000 |
| commit | 27344f7f27efc2ffa010f97377da7adc39e396c6 (patch) | |
| tree | 87f8f3e11f4c58ce9aca886037ac60aabc38f819 | |
| parent | 1c1b0b0a4c1800e77caf531c11e2c11a88d69abf (diff) | |
Use killall5 again so we can cleanly remount / readonly, #168977
and #177689.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | init.d/halt.sh | 6 | ||||
| -rw-r--r-- | sh/rc-mount.sh | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -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) diff --git a/init.d/halt.sh b/init.d/halt.sh index 701a56c6..1b4acca0 100755 --- a/init.d/halt.sh +++ b/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 diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index 7a2b2a51..be9dffba 100644 --- a/sh/rc-mount.sh +++ b/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 |