[arch-projects] [initscripts] [PATCH 09/18] Move check on executable fsck into fsck_all() for consistency

[Kurt J. Bosch]

---
 functions  |    1 +
 rc.sysinit |   10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/functions b/functions
index 5ea732e..e879d30 100644
--- a/functions
+++ b/functions
@@ -375,6 +375,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
diff --git a/rc.sysinit b/rc.sysinit
index d674e72..d51e88b 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -186,12 +186,10 @@ if [[ -f /etc/crypttab && $CS ]] && grep -q ^[^#] /etc/crypttab; then
 	fi
 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 /
-- 
1.7.1