summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-08-27 12:42:57 +0200
committerJonathan Bauer2019-08-27 12:42:57 +0200
commit1a8bf692aa8df31f7aa809b947f3b25a875bc1dd (patch)
treea5e259ffc9f81e827563c11f8eb91a0bd97f5c9e
parent[busybox] fix installation path in stage4 (diff)
downloadsystemd-init-1a8bf692aa8df31f7aa809b947f3b25a875bc1dd.tar.gz
systemd-init-1a8bf692aa8df31f7aa809b947f3b25a875bc1dd.tar.xz
systemd-init-1a8bf692aa8df31f7aa809b947f3b25a875bc1dd.zip
[slx-network] SLX_STAGE4_DHCP support
to control whether to automatically enable our udhcpc-based service or not
-rw-r--r--builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh b/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
index 94546d3e..e8d29b40 100644
--- a/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
+++ b/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
@@ -1,7 +1,12 @@
#!/bin/bash
+#
+# This script configures the udhcpc-based DHCP service for
+# within stage4, unless specifically disabled by SLX_STAGE4_DHCP
-. /run/openslx/network.conf
+. /etc/openslx
+[ -n "$SLX_STAGE4_DHCP" ] || exit 0
+. /run/openslx/network.conf
for script in setup-bootif-network udhcpc-trigger; do
if [ -e "${NEWROOT}/opt/openslx/scripts/${script}" ]; then
mv "${NEWROOT}/opt/openslx/scripts/${script}"{,.stage4}