summaryrefslogtreecommitdiffstats
path: root/core/modules/dhcpc-busybox
diff options
context:
space:
mode:
authorSimon Rettberg2019-03-13 15:04:02 +0100
committerSimon Rettberg2019-03-13 15:04:02 +0100
commit519740bc2ebcc40e8e61b547b2b49e26efb53bb2 (patch)
tree2fd3204ad97e6b2fb390b49e8252aaf842c76a5b /core/modules/dhcpc-busybox
parent[hardware-stats] Show warning if using nouveau (diff)
downloadmltk-519740bc2ebcc40e8e61b547b2b49e26efb53bb2.tar.gz
mltk-519740bc2ebcc40e8e61b547b2b49e26efb53bb2.tar.xz
mltk-519740bc2ebcc40e8e61b547b2b49e26efb53bb2.zip
[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.
Diffstat (limited to 'core/modules/dhcpc-busybox')
-rwxr-xr-xcore/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc++2
1 files changed, 1 insertions, 1 deletions
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"