[arch-projects] [PATCH 4/4] Move mount -a into functions to allow custom override (fsck on loop)

[Kurt J. Bosch]

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

diff --git a/functions b/functions
index a02bd3b..f4435b1 100644
--- a/functions
+++ b/functions
@@ -372,6 +372,14 @@ fsck_reboot() {
 	exit 0
 }
 
+mount_all() {
+	stat_busy "Mounting Local Filesystems"
+	run_hook sysinit_premount
+	mount -a -t $NETFS -O no_netdev
+	run_hook sysinit_postmount
+	stat_done
+}
+
 ###############################
 # Custom hooks in initscripts #
 ###############################
diff --git a/rc.sysinit b/rc.sysinit
index 5af74a1..7bcd0a5 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -216,7 +216,7 @@ if [[ -x $(type -P fsck) ]]; then
 	fsck_reboot $?
 fi
 
-stat_busy "Mounting Local Filesystems"
+status "Remounting Root Read/Write" \
 	mount -n -o remount,rw /
 
 	# don't touch /etc/mtab if it is a symlink to /proc/self/mounts
@@ -228,11 +228,8 @@ stat_busy "Mounting Local Filesystems"
 		cat /proc/mounts >| /etc/mtab
 	fi
 
-	run_hook sysinit_premount
 	# now mount all the local filesystems
-	mount -a -t $NETFS -O no_netdev
-	run_hook sysinit_postmount
-stat_done
+mount_all
 
 # enable monitoring of lvm2 groups, now that the filesystems are mounted rw
 if [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]]; then
-- 
1.7.1