diff options
Diffstat (limited to 'modules.d/slx-network')
4 files changed, 11 insertions, 65 deletions
diff --git a/modules.d/slx-network/module-setup.sh b/modules.d/slx-network/module-setup.sh index 498c7102..d907da51 100755 --- a/modules.d/slx-network/module-setup.sh +++ b/modules.d/slx-network/module-setup.sh @@ -33,36 +33,20 @@ install() { inst "${moddir}/services/udhcpc-bootif-stage4.service" "/opt/openslx/services/udhcpc-bootif.service" # Parse IP config etc. from KCL - _name="s3-parse-network-kcl" - 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" + # After cmdline, we need the extracted MAC + # Before udev, as we generate a udev rule for naming the iface + slx_service "s3-parse-network-kcl" "Extract network config from KCL" \ + --wafter "dracut-cmdline.service" \ + --wbefore "systemd-udevd.service" # Setup bootif network: bridge, vlan, dhcp, ... - _name="s3-setup-bootif-network" - 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-setup-bootif-network" "Configure main network link" \ + --wafter "s3-parse-network-kcl.service" # Copy files related to networking. Must be the very last thing before switchroot to # make sure nothing else tries to meddle with these after copying, e.g. slx-ssl. - _name="s3-copy-network-files" - 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-copy-network-files" "Copy networking-related files to stage 4" \ + --after "s3-ssl-sat.service" \ + --wafter "initrd-root-fs.target" \ + --after "s3-setup-bootif-network.service" # hooks inst_hook pre-pivot 10 "${moddir}/hooks/configure-jumbo-frames.sh" diff --git a/modules.d/slx-network/services/s3-copy-network-files.service b/modules.d/slx-network/services/s3-copy-network-files.service deleted file mode 100644 index 24325cef..00000000 --- a/modules.d/slx-network/services/s3-copy-network-files.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Copy networking-related files to stage 4 -After=s3-ssl-sat.service -After=initrd-root-fs.target -Before=initrd-switch-root.target -DefaultDependencies=no -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-copy-network-files.sh diff --git a/modules.d/slx-network/services/s3-parse-network-kcl.service b/modules.d/slx-network/services/s3-parse-network-kcl.service deleted file mode 100644 index 89ffcecf..00000000 --- a/modules.d/slx-network/services/s3-parse-network-kcl.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Extract network config from KCL -DefaultDependencies=no -# Need MAC extracted from cmdline -Wants=dracut-cmdline.service -After=dracut-cmdline.service -# We generate a naming rule for the boot interface -Wants=systemd-udevd.service -Before=systemd-udevd.service -IgnoreOnIsolate=true - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-parse-network-kcl.sh diff --git a/modules.d/slx-network/services/s3-setup-bootif-network.service b/modules.d/slx-network/services/s3-setup-bootif-network.service deleted file mode 100644 index 4b0ed4b2..00000000 --- a/modules.d/slx-network/services/s3-setup-bootif-network.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Configure main network link -DefaultDependencies=no -IgnoreOnIsolate=true -Wants=s3-parse-network-kcl.service -After=s3-parse-network-kcl.service - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/local/bin/s3-setup-bootif-network.sh |