diff options
Diffstat (limited to 'modules.d/slx-addons')
| -rwxr-xr-x | modules.d/slx-addons/module-setup.sh | 14 | ||||
| -rw-r--r-- | modules.d/slx-addons/services/s3-setup-addons.service | 14 |
2 files changed, 5 insertions, 23 deletions
diff --git a/modules.d/slx-addons/module-setup.sh b/modules.d/slx-addons/module-setup.sh index ed1ad89e..db186ab7 100755 --- a/modules.d/slx-addons/module-setup.sh +++ b/modules.d/slx-addons/module-setup.sh @@ -11,13 +11,9 @@ install() { inst "${moddir}/services/ldconfig-stage4.service" \ "/opt/openslx/services/ldconfig-stage4.service" # Install service that enables addons - _name="s3-setup-addons" - 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.wants" - ln_r "${systemdsystemunitdir}/${_name}.service" \ - "${systemdsystemunitdir}/initrd.target.wants/${_name}.service" + # Order after busybox-stage4, as the addon-required check script + # depends on ash being available in stage4 + slx_service "s3-setup-addons" "Enable SLX addons" \ + --after "initrd-root-fs.target" \ + --wafter "s3-install-busybox-stage4.service" } diff --git a/modules.d/slx-addons/services/s3-setup-addons.service b/modules.d/slx-addons/services/s3-setup-addons.service deleted file mode 100644 index 3c5a7fb4..00000000 --- a/modules.d/slx-addons/services/s3-setup-addons.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Enable SLX addons -After=initrd-root-fs.target -Before=initrd-switch-root.target -# Ugly: the addon-required script of vmware needs ash in stage 4 -After=s3-install-busybox-stage4.service -Wants=s3-install-busybox-stage4.service -DefaultDependencies=no -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-setup-addons.sh |