init: Remove run_hooks(). Fixes #7

kisslinux · Jan 13, 2020 · b6831fb · b6831fb
1 parent 254f7aa
commit b6831fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/init/rc.boot b/lib/init/rc.boot
@@ -151,7 +151,9 @@ log "Loading sysctl settings..."; {
 }
 
 log "Running rc.d hooks..."; {
-    run_hooks /etc/rc.d/*.boot
+    for file in /etc/rc.d/*.boot; do
+        [ -f "$file" ] && . "$file"
+    done
 }
 
 command -v udevd >/dev/null &&

diff --git a/lib/init/rc.lib b/lib/init/rc.lib
@@ -45,9 +45,3 @@ killall5_sh() {
 
     kill -s SIGCONT -1
 }
-
-run_hooks() {
-    [ -f "$1" ] && for file in "$@"; do
-        [ -f "$file" ] && . "$file"
-    done
-}
diff --git a/lib/init/rc.shutdown b/lib/init/rc.shutdown
@@ -10,7 +10,9 @@ log "Loading rc.conf settings..."; {
 }
 
 log "Running shutdown pre hooks..."; {
-    run_hooks /etc/rc.d/*.pre.shutdown
+    for file in /etc/rc.d/*.pre.shutdown; do
+        [ -f "$file" ] && . "$file"
+    done
 }
 
 log "Waiting for services to stop..."; {
@@ -50,5 +52,7 @@ log "Deactivating dmcrypt devices (if any exist)."; {
 }
 
 log "Running shutdown post hooks..."; {
-    run_hooks /etc/rc.d/*.post.shutdown
+    for file in /etc/rc.d/*.post.shutdown; do
+        [ -f "$file" ] && . "$file"
+    done
 }