From 1a8bf692aa8df31f7aa809b947f3b25a875bc1dd Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 Aug 2019 12:42:57 +0200
Subject: [slx-network] SLX_STAGE4_DHCP support

to control whether to automatically enable our udhcpc-based service or
not
---
 builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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}
-- 
cgit v1.2.3-55-g7522