From 519740bc2ebcc40e8e61b547b2b49e26efb53bb2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 13 Mar 2019 15:04:02 +0100
Subject: [rootfs-stage31/dhcpc-busybox] Back to old DHCP behavior

Since the PXE spec abolished th practive of having the PXE ROM set the
uid field of the DHCP request to the system's UUID, we also shouldn't be
doing it. Make it a KCL option called dhcpuuid.
---
 core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modules/dhcpc-busybox')

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 4487b2c8..7d7dfc68 100755
--- a/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++
+++ b/core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++
@@ -13,7 +13,7 @@ fi
 primary="br0"
 [ -n "$SLX_BRIDGE" ] && primary="$SLX_BRIDGE"
 
-if [ "$primary" = "$net_if" ]; then
+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
 		echo "Using SMBIOS uid for DHCP"
-- 
cgit v1.2.3-55-g7522