From a89c68b1ba2941ddd59d8b31d30fe3a7eaaed71f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 4 Jul 2024 18:47:46 +0200
Subject: [slx-network] Fix copying stage4 dhcp files

---
 modules.d/slx-network/hooks/activate-stage4-dhcp.sh | 7 ++-----
 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"
 
-- 
cgit v1.2.3-55-g7522