refactor(squash): move all setup code to init-squash.sh

Seperate of init.sh and setup-squash.sh is pointless, merge them into one.

diff --git a/modules.d/99squash/setup-squash.sh b/modules.d/99squash/init-squash.sh
similarity index 93%
rename from modules.d/99squash/setup-squash.sh
rename to modules.d/99squash/init-squash.sh
index 253e6101c58975397c113f6fff30094dfc4eaae4..449585f0013d0154ade3449b9cb3b1947c66b275 100755 (executable)
--- a/modules.d/99squash/setup-squash.sh
+++ b/modules.d/99squash/init-squash.sh
@@ -59,3 +59,8 @@ for file in $SQUASH_MNT/*; do
 
        echo $mntdir >> $SQUASH_MNT_REC
 done
+
+exec /init.orig
+
+echo "Something went wrong when trying to exec original init!"
+exit 1

diff --git a/modules.d/99squash/init.sh b/modules.d/99squash/init.sh
deleted file mode 100755 (executable)
index d8b2cbb..0000000
--- a/modules.d/99squash/init.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-/squash/setup-squash.sh
-
-exec /init.orig
-
-echo "Something went wrong when trying to start original init executable!"
-exit 1

diff --git a/modules.d/99squash/module-setup.sh b/modules.d/99squash/module-setup.sh
index 18aaf429a62daf9390f7f86623c589c6a6955748..d531cec062e040a83f4dea4c2641fa942610178e 100644 (file)
--- a/modules.d/99squash/module-setup.sh
+++ b/modules.d/99squash/module-setup.sh
@@ -48,11 +48,10 @@ installpost() {
     # Install required files for the squash image setup script.
     hostonly="" instmods "loop" "squashfs" "overlay"
     inst_multiple modprobe mount mkdir ln echo
-    inst "$moddir"/setup-squash.sh /squash/setup-squash.sh
-    inst "$moddir"/clear-squash.sh /squash/clear-squash.sh
 
     mv "$initdir"/init "$initdir"/init.orig
-    inst "$moddir"/init.sh "$initdir"/init
+    inst "$moddir"/init-squash.sh /init
+    inst "$moddir"/clear-squash.sh /squash/clear-squash.sh
 
     # Keep systemctl outsite if we need switch root
     if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then