From eec5e1576e70d27caa639f36e34679ed18817458 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 8 Jul 2021 16:05:57 +0200
Subject: Add installer mode for stage4

---
 core/modules/busybox/module.build | 10 ++++++++--
 core/modules/busybox/module.conf  |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'core/modules/busybox')

diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build
index 9b83e1e7..ae009259 100644
--- a/core/modules/busybox/module.build
+++ b/core/modules/busybox/module.build
@@ -34,8 +34,14 @@ build() {
 	pinfo "Running make (if this hangs, check for unset options, ie. when you increased the REQUIRED_BRANCH)"
 	make || perror "failed."
 	pinfo "Running make install"
-	make CONFIG_PREFIX="$MODULE_BUILD_DIR" install || perror "failed"
-	rm -f "$MODULE_BUILD_DIR/bin/mount" "$MODULE_BUILD_DIR/bin/umount" "$MODULE_BUILD_DIR/bin/bash"
+	local INSTALL_PREFIX
+	if [ -n "$REMOTE_LOCAL_INSTALL" ]; then
+		INSTALL_PREFIX="${MODULE_BUILD_DIR}/opt/openslx"
+	else
+		INSTALL_PREFIX="${MODULE_BUILD_DIR}"
+	fi
+	make CONFIG_PREFIX="${INSTALL_PREFIX}" install || perror "failed"
+	rm -f "${INSTALL_PREFIX}/bin/mount" "${INSTALL_PREFIX}/bin/umount" "${INSTALL_PREFIX}/bin/bash"
 }
 
 post_copy() {
diff --git a/core/modules/busybox/module.conf b/core/modules/busybox/module.conf
index 265f53f3..6f29188b 100644
--- a/core/modules/busybox/module.conf
+++ b/core/modules/busybox/module.conf
@@ -3,6 +3,5 @@ REQUIRED_GIT="git://git.busybox.net/busybox"
 REQUIRED_BRANCH="1_31_1"
 REQUIRED_BINARIES="busybox"
 REQUIRED_DIRECTORIES="
-	/bin
-	/sbin
+	/
 "
-- 
cgit v1.2.3-55-g7522