From 1669578b20a4c64e0f19322c476e4d49f090abf6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 29 Jan 2024 11:53:45 +0100
Subject: [dhcpc-busybox] Remove check for non-existent var

Nobody else ever checks or sets SLX_DHCP_SECONDARY.
We already have SLX_DHCP_OTHER_NICS to control whether to run a DHCP
client on other interfaces. This happens in systemd-bridge_additional_nics
where we conditionally spawn udhcpc instances for appropriate interfaces
if the above variable is set. No need for another check in the dhcpc
client wrapper script.
---
 core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'core')

diff --git a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc
index 49d0180d..a29756b7 100755
--- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc
+++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc
@@ -12,11 +12,6 @@ fi
 . /opt/openslx/config
 primary="${SLX_BRIDGE:-br0}"
 
-if [ "${SLX_DHCP_SECONDARY:-yes}" != "yes" ]; then
-	echo "No DHCP on other NICs requested. Doing nothing."
-	exit 0
-fi
-
 if [ "$primary" = "$net_if" ] && [ "$SLX_NET_DHCP_UUID" = "yes" ]; then
 	uid="$( dmidecode -s system-uuid | sed -r 's/^(..)(..)(..)(..)-(..)(..)-(..)(..)-(....)-/00\4\3\2\1\6\5\8\7\9/' )"
 	if [ "${#uid}" = 34 ]; then
-- 
cgit v1.2.3-55-g7522