diff options
-rwxr-xr-x | rc.d/init.d/halt | 5 | ||||
-rwxr-xr-x | rc.d/init.d/netfs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 267a7c83..8b990791 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -199,6 +199,11 @@ if [ "$command" = /sbin/halt ] && [ -f /etc/sysconfig/ups ]; then fi fi +# Turn off UPS in powerfail situation +if [ -x /etc/apcupsd/apccontrol -a -f /etc/apcupsd/powerfail ]; then + /etc/apcupsd/apccontrol killpower +fi + # First, try kexec. If that fails, fall back to rebooting the old way. [ -n "$kexec_command" ] && $kexec_command -e -x >& /dev/null diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 0376d907..a1bc022a 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -67,7 +67,7 @@ case "$1" in STRING=$"Checking network-attached filesystems" echo $STRING - fsck -A -T -R -a -t opts=_netdev + fsck -A -T -M -a -t opts=_netdev rc=$? if [ "$rc" -eq "0" ]; then |