summaryrefslogtreecommitdiffstats
path: root/modules.d/slx-uuid
diff options
context:
space:
mode:
Diffstat (limited to 'modules.d/slx-uuid')
-rwxr-xr-xmodules.d/slx-uuid/module-setup.sh12
-rw-r--r--modules.d/slx-uuid/services/s3-get-system-uuid.service13
2 files changed, 3 insertions, 22 deletions
diff --git a/modules.d/slx-uuid/module-setup.sh b/modules.d/slx-uuid/module-setup.sh
index 9208c307..c89daae9 100755
--- a/modules.d/slx-uuid/module-setup.sh
+++ b/modules.d/slx-uuid/module-setup.sh
@@ -24,13 +24,7 @@ install() {
inst_multiple dmidecode
inst_hook pre-pivot 10 "$moddir/hooks/copy-system-uuid-to-newroot.sh"
- _name="s3-get-system-uuid"
- 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"
+ slx_service "s3-get-system-uuid" "Get system UUID" \
+ --wafter "s3-parse-network-kcl.service" \
+ --wafter "dracut-cmdline.service"
}
diff --git a/modules.d/slx-uuid/services/s3-get-system-uuid.service b/modules.d/slx-uuid/services/s3-get-system-uuid.service
deleted file mode 100644
index b726cd2b..00000000
--- a/modules.d/slx-uuid/services/s3-get-system-uuid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Get system UUID
-Requires=dracut-cmdline.service
-After=dracut-cmdline.service
-Wants=s3-parse-network-kcl.service
-After=s3-parse-network-kcl.service
-DefaultDependencies=no
-IgnoreOnIsolate=true
-
-[Service]
-Type=oneshot
-RemainAfterExit=true
-ExecStart=/usr/local/bin/s3-get-system-uuid.sh