浏览代码

Adjustments to the shutdown scripts

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9784 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Bruce Dubbs 13 年之前
父节点
当前提交
e77cfbf41a
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      bootscripts/Makefile
  2. 2 2
      bootscripts/lfs/init.d/mountfs

+ 2 - 2
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
 

+ 2 - 2
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
       ;;
 
    *)