aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-03-23 02:18:15 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-03-23 02:18:15 +0000
commite77cfbf41aff45475d20fdfb5bfa00c630a36881 (patch)
tree1bab3e6030dfe19fb018510253ddf219a0b5d5b1
parentc8995814d1950d124de2ffc75d97b31c67c58b4c (diff)
Adjustments to the shutdown scripts
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9784 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--bootscripts/Makefile4
-rw-r--r--bootscripts/lfs/init.d/mountfs4
2 files changed, 4 insertions, 4 deletions
diff --git a/bootscripts/Makefile b/bootscripts/Makefile
index 48a5f27c6..b3261ec79 100644
--- a/bootscripts/Makefile
+++ b/bootscripts/Makefile
@@ -90,8 +90,8 @@ rc0: files
ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network
ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc0.d/K90sysklogd
ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
+ ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S65swap
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc0.d/S70mountfs
- ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S80swap
ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc0.d/S90localnet
ln -sf ../init.d/halt ${EXTDIR}/rc.d/rc0.d/S99halt
@@ -119,8 +119,8 @@ rc6: files
ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network
ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc6.d/K90sysklogd
ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
+ ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc6.d/S65swap
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc6.d/S70mountfs
- ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc6.d/S80swap
ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc6.d/S90localnet
ln -sf ../init.d/reboot ${EXTDIR}/rc.d/rc6.d/S99reboot
diff --git a/bootscripts/lfs/init.d/mountfs b/bootscripts/lfs/init.d/mountfs
index 40a69eefa..0d3f2c78d 100644
--- a/bootscripts/lfs/init.d/mountfs
+++ b/bootscripts/lfs/init.d/mountfs
@@ -62,11 +62,11 @@ case "${1}" in
stop)
# Don't unmount tmpfs like /run
log_info_msg "Unmounting all other currently mounted file systems..."
- umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs >/dev/null
+ umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc >/dev/null
evaluate_retval
# Make all LVM volume groups unavailable, if appropriate
- if [ -x /sbin/vgchange ]; then /sbin/vgchange -an; fi
+ if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
;;
*)