init: multiple changes

- kill runit services only if sv is available on the system
- add run_hook function
- add early-boot hook

1 files changed, 3 insertions, 7 deletions

diff --git a/rc.boot b/rc.boot
index b9e7e14..c02d4c2 100755
--- a/rc.boot
+++ b/rc.boot
@@ -71,7 +71,8 @@ out "Mounting all local filesystems..."; {
     mount -at nosysfs,nonfs,nonfs4,nosmbfs,nocifs -O no_netdev ||
         shell
 }
-}
+
+run_hook early-boot
 
 out "Enabling swap..."; {
     swapon -a || shell
@@ -126,12 +127,7 @@ command -v udevd >/dev/null &&
     udevadm control --exit
 
 
-out "Running boot hooks..."
-set +f
-for file in /etc/init/*.boot ; do
-	[ -f "$file" ] && \
-		out "Running $file" && . "$file"
-done
+run_hook boot
 
 out "Running rc.local..."; {
 	[ -r "/etc/init/rc.local" ] && \