summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-08-08 13:52:50 +0200
committerJonathan Bauer2019-08-08 13:52:50 +0200
commitcc96ca29557586ff63d5c1fb192bcd570cc1cef7 (patch)
treea6a672a8f574a111a4826704e172b7db4101d052
parent[busybox] only install if binary is there (diff)
downloadsystemd-init-cc96ca29557586ff63d5c1fb192bcd570cc1cef7.tar.gz
systemd-init-cc96ca29557586ff63d5c1fb192bcd570cc1cef7.tar.xz
systemd-init-cc96ca29557586ff63d5c1fb192bcd570cc1cef7.zip
[busybox] install busybox into stage4
-rw-r--r--builder/modules.d/busybox/install-busybox-stage4.sh7
-rw-r--r--builder/modules.d/busybox/module-setup.sh1
-rwxr-xr-xbuilder/modules.d/slx-network/scripts/setup-bootif-network.stage3 (renamed from builder/modules.d/slx-network/scripts/setup-network)0
-rwxr-xr-xbuilder/modules.d/slx-network/scripts/udhcpc-trigger-stage3 (renamed from builder/modules.d/slx-network/scripts/udhcpc-trigger)0
4 files changed, 8 insertions, 0 deletions
diff --git a/builder/modules.d/busybox/install-busybox-stage4.sh b/builder/modules.d/busybox/install-busybox-stage4.sh
new file mode 100644
index 00000000..dde07184
--- /dev/null
+++ b/builder/modules.d/busybox/install-busybox-stage4.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if hash busybox; then
+ mkdir -p "$NEWROOT/opt/openslx/bin"
+ busybox --install -s "$NEWROOT/opt/openslx/bin"
+fi
+true
diff --git a/builder/modules.d/busybox/module-setup.sh b/builder/modules.d/busybox/module-setup.sh
index 76999943..807022e9 100644
--- a/builder/modules.d/busybox/module-setup.sh
+++ b/builder/modules.d/busybox/module-setup.sh
@@ -38,4 +38,5 @@ install() {
fi
inst "${moddir}/src/busybox" "/bin/busybox"
inst_hook cmdline 00 "${moddir}/install-busybox.sh"
+ inst_hook pre-pivot 50 "${moddir}/install-busybox-stage4.sh"
}
diff --git a/builder/modules.d/slx-network/scripts/setup-network b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
index 1f9eaddf..1f9eaddf 100755
--- a/builder/modules.d/slx-network/scripts/setup-network
+++ b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
diff --git a/builder/modules.d/slx-network/scripts/udhcpc-trigger b/builder/modules.d/slx-network/scripts/udhcpc-trigger-stage3
index 8bed11c7..8bed11c7 100755
--- a/builder/modules.d/slx-network/scripts/udhcpc-trigger
+++ b/builder/modules.d/slx-network/scripts/udhcpc-trigger-stage3