From fff2690d71cf705980ee597ae9911ad5a2a64e50 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 Aug 2019 12:35:42 +0200
Subject: [busybox] fix installation path in stage4

---
 builder/modules.d/busybox/install-busybox-stage4.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/builder/modules.d/busybox/install-busybox-stage4.sh b/builder/modules.d/busybox/install-busybox-stage4.sh
index f0e25945..ad34b75c 100644
--- a/builder/modules.d/busybox/install-busybox-stage4.sh
+++ b/builder/modules.d/busybox/install-busybox-stage4.sh
@@ -1,8 +1,16 @@
 #!/bin/bash
 
 if hash busybox; then
-	mkdir -p "$NEWROOT/opt/openslx/bin"
-	busybox --install -s "$NEWROOT/opt/openslx/bin"
-	cp "$(type -p busybox)" "$NEWROOT/opt/openslx/bin"
+	# check if the stage4 has a busybox in the same location
+	# as within the initramfs. If so, we keep it and just hope
+	# that everything works out. If there is none, we can copy
+	# our busybox there safely
+	bb_path="$(type -p busybox)"
+	if ! [ -x "${NEWROOT}/${bb_path}" ]; then
+		cp -f "$bb_path" "${NEWROOT}/${bb_path}"
+	fi
+	# finally install the applets under /opt/openslx/bin
+	mkdir -p "${NEWROOT}/opt/openslx/bin"
+	busybox --install -s "${NEWROOT}/opt/openslx/bin"
 fi
 true
-- 
cgit v1.2.3-55-g7522