Skip to content

Commit f9f4264

Browse files
ryncsnjohannbg
authored andcommitted
refactor(squash): move all setup code to init-squash.sh
Seperate of init.sh and setup-squash.sh is pointless, merge them into one.
1 parent 8c8aecd commit f9f4264

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

modules.d/99squash/setup-squash.sh renamed to modules.d/99squash/init-squash.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,8 @@ for file in $SQUASH_MNT/*; do
5959

6060
echo $mntdir >> $SQUASH_MNT_REC
6161
done
62+
63+
exec /init.orig
64+
65+
echo "Something went wrong when trying to exec original init!"
66+
exit 1

modules.d/99squash/init.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

modules.d/99squash/module-setup.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ installpost() {
4848
# Install required files for the squash image setup script.
4949
hostonly="" instmods "loop" "squashfs" "overlay"
5050
inst_multiple modprobe mount mkdir ln echo
51-
inst "$moddir"/setup-squash.sh /squash/setup-squash.sh
52-
inst "$moddir"/clear-squash.sh /squash/clear-squash.sh
5351

5452
mv "$initdir"/init "$initdir"/init.orig
55-
inst "$moddir"/init.sh "$initdir"/init
53+
inst "$moddir"/init-squash.sh /init
54+
inst "$moddir"/clear-squash.sh /squash/clear-squash.sh
5655

5756
# Keep systemctl outsite if we need switch root
5857
if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then

0 commit comments

Comments
 (0)