diff options
author | Kurt J. Bosch <kjb-temp-2009@alpenjodel.de> | 2011-06-25 11:08:05 +0200 |
---|---|---|
committer | Kurt J. Bosch <kjb-temp-2009@alpenjodel.de> | 2011-06-28 15:39:42 +0200 |
commit | fac564337b20eb7b4b1a6163a8290c1058d116b1 (patch) | |
tree | 921b1b0fbdad4ab26070c551988959f30a36d8b1 | |
parent | 7788571a9854b58c9bee058a36db4b1d0d41f614 (diff) | |
download | initscripts-fac564337b20eb7b4b1a6163a8290c1058d116b1.tar.xz |
Move fsck executable check into fsck_all() for consistency
-rw-r--r-- | functions | 1 | ||||
-rwxr-xr-x | rc.sysinit | 10 |
2 files changed, 5 insertions, 6 deletions
@@ -362,6 +362,7 @@ NETFS="nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,noshfs,nofuse,nofuse # Check local filesystems fsck_all() { + [[ -x $(type -P fsck) ]] || return 0 stat_busy "Checking Filesystems" FSCK_OUT=/dev/stdout FSCK_ERR=/dev/stdout @@ -176,12 +176,10 @@ if [[ -f /etc/crypttab && $CS ]] && grep -q ^[^#] /etc/crypttab; then (( crypto_unlocked == 1 )) && activate_vgs fi -if [[ -x $(type -P fsck) ]]; then - # Check filesystems - fsck_all - # Single-user login and/or automatic reboot if needed - fsck_reboot $? -fi +# Check filesystems +fsck_all +# Single-user login and/or automatic reboot if needed +fsck_reboot $? status "Remounting Root Read/Write" \ mount -n -o remount,rw / |