diff options
| author | Simon Rettberg | 2024-07-04 18:47:46 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2024-07-04 18:47:46 +0200 |
| commit | a89c68b1ba2941ddd59d8b31d30fe3a7eaaed71f (patch) | |
| tree | 028f80fe559e77fa97070c6c459816f1720a06e1 | |
| parent | [slx-extra-script] Order post-mount after post-dmsetup (diff) | |
| download | systemd-init-a89c68b1ba2941ddd59d8b31d30fe3a7eaaed71f.tar.gz systemd-init-a89c68b1ba2941ddd59d8b31d30fe3a7eaaed71f.tar.xz systemd-init-a89c68b1ba2941ddd59d8b31d30fe3a7eaaed71f.zip | |
[slx-network] Fix copying stage4 dhcp files
| -rwxr-xr-x | modules.d/slx-network/hooks/activate-stage4-dhcp.sh | 7 | ||||
| -rwxr-xr-x | modules.d/slx-network/module-setup.sh | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/modules.d/slx-network/hooks/activate-stage4-dhcp.sh b/modules.d/slx-network/hooks/activate-stage4-dhcp.sh index 8ac1e7b0..1394d34c 100755 --- a/modules.d/slx-network/hooks/activate-stage4-dhcp.sh +++ b/modules.d/slx-network/hooks/activate-stage4-dhcp.sh @@ -9,11 +9,8 @@ if [ "$SLX_STAGE4_DHCP" != "no" ] \ && ! [ -e "${NEWROOT}/opt/openslx/scripts/udhcpc-openslx" ]; then mkdir -p "${NEWROOT}/opt/openslx/scripts" - for script in s3-setup-bootif-network udhcpc-trigger; do - if [ -e "${NEWROOT}/opt/openslx/scripts/${script}" ]; then - mv "${NEWROOT}/opt/openslx/scripts/${script}"{,.stage4} - fi - cp -f "/opt/openslx/scripts/${script}.stage4" \ + for script in setup-bootif-network udhcpc-trigger; do + cp -n "/opt/openslx/scripts/${script}.stage4" \ "${NEWROOT}/opt/openslx/scripts/${script}" done diff --git a/modules.d/slx-network/module-setup.sh b/modules.d/slx-network/module-setup.sh index 3684d161..905b4672 100755 --- a/modules.d/slx-network/module-setup.sh +++ b/modules.d/slx-network/module-setup.sh @@ -27,7 +27,7 @@ install() { inst "${moddir}/scripts/udhcpc-trigger.stage3" "/usr/local/bin/udhcpc-trigger" # files for stage4, park them in /opt/openslx - inst "${moddir}/scripts/s3-setup-bootif-network.stage4" "/opt/openslx/scripts/s3-setup-bootif-network.stage4" + inst "${moddir}/scripts/setup-bootif-network.stage4" "/opt/openslx/scripts/setup-bootif-network.stage4" inst "${moddir}/scripts/udhcpc-trigger.stage4" "/opt/openslx/scripts/udhcpc-trigger.stage4" inst "${moddir}/services/udhcpc-bootif-stage4.service" "/opt/openslx/services/udhcpc-bootif.service" |