diff options
Diffstat (limited to 'modules.d/busybox')
| -rwxr-xr-x | modules.d/busybox/module-setup.sh | 20 | ||||
| -rw-r--r-- | modules.d/busybox/services/s3-install-busybox-stage4.service | 11 | ||||
| -rw-r--r-- | modules.d/busybox/services/s3-install-busybox.service | 11 |
3 files changed, 9 insertions, 33 deletions
diff --git a/modules.d/busybox/module-setup.sh b/modules.d/busybox/module-setup.sh index 99e7574d..b068eabc 100755 --- a/modules.d/busybox/module-setup.sh +++ b/modules.d/busybox/module-setup.sh @@ -35,15 +35,13 @@ install() { derror "Failed to find busybox binary in build directory!" return 1 fi - inst "${moddir}/src/busybox" "/bin/busybox" - for _name in "s3-install-busybox" "s3-install-busybox-stage4"; do - inst "$moddir/hooks/${_name}.sh" \ - "/usr/local/bin/${_name}.sh" - inst_simple "${moddir}/services/${_name}.service" \ - "${systemdsystemunitdir}/${_name}.service" - mkdir --parents \ - "${initdir}/${systemdsystemunitdir}/initrd.target.requires" - ln_r "${systemdsystemunitdir}/${_name}.service" \ - "${systemdsystemunitdir}/initrd.target.requires/${_name}.service" - done + if ! inst "${moddir}/src/busybox" "/bin/busybox"; then + derror "Could not install busybox" + return 1 + fi + slx_service "s3-install-busybox" "Install busybox applet symlinks" \ + --wbefore "dracut-cmdline.service" + slx_service "s3-install-busybox-stage4" "Install busybox into stage 4" \ + --wafter "initrd-root-fs.target" \ + --after "s3-install-busybox.service" } diff --git a/modules.d/busybox/services/s3-install-busybox-stage4.service b/modules.d/busybox/services/s3-install-busybox-stage4.service deleted file mode 100644 index b9ed87f0..00000000 --- a/modules.d/busybox/services/s3-install-busybox-stage4.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Install busybox into stage 4 -After=initrd-root-fs.target -Wants=initrd-root-fs.target -DefaultDependencies=no -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-install-busybox-stage4.sh diff --git a/modules.d/busybox/services/s3-install-busybox.service b/modules.d/busybox/services/s3-install-busybox.service deleted file mode 100644 index b52500db..00000000 --- a/modules.d/busybox/services/s3-install-busybox.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Install busybox applet symlinks -Before=dracut-cmdline.service -Wants=dracut-cmdline.service -DefaultDependencies=no -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-install-busybox.sh |