Browse Source

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

Seperate of init.sh and setup-squash.sh is pointless, merge them into one.
master
Kairui Song 4 years ago committed by Jóhann B. Guðmundsson
parent
commit
f9f4264d03
  1. 5
      modules.d/99squash/init-squash.sh
  2. 7
      modules.d/99squash/init.sh
  3. 5
      modules.d/99squash/module-setup.sh

5
modules.d/99squash/setup-squash.sh → modules.d/99squash/init-squash.sh

@ -59,3 +59,8 @@ for file in $SQUASH_MNT/*; do


echo $mntdir >> $SQUASH_MNT_REC echo $mntdir >> $SQUASH_MNT_REC
done done

exec /init.orig

echo "Something went wrong when trying to exec original init!"
exit 1

7
modules.d/99squash/init.sh

@ -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

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

@ -48,11 +48,10 @@ installpost() {
# Install required files for the squash image setup script. # Install required files for the squash image setup script.
hostonly="" instmods "loop" "squashfs" "overlay" hostonly="" instmods "loop" "squashfs" "overlay"
inst_multiple modprobe mount mkdir ln echo 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 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 # Keep systemctl outsite if we need switch root
if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then if [[ ! -f "$initdir/lib/dracut/no-switch-root" ]]; then

Loading…
Cancel
Save