diff options
| author | Simon Rettberg | 2024-01-29 11:53:45 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2024-01-29 11:53:45 +0100 |
| commit | 1669578b20a4c64e0f19322c476e4d49f090abf6 (patch) | |
| tree | 796682356e398c28327c6ad53e24c1e00cf7f13c | |
| parent | [system-check/hardware-stats] Loosen dependencies (diff) | |
| download | mltk-1669578b20a4c64e0f19322c476e4d49f090abf6.tar.gz mltk-1669578b20a4c64e0f19322c476e4d49f090abf6.tar.xz mltk-1669578b20a4c64e0f19322c476e4d49f090abf6.zip | |
[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.
| -rwxr-xr-x | core/modules/dhcpc-busybox/data/opt/openslx/scripts/systemd-udhcpc | 5 |
1 files changed, 0 insertions, 5 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 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 |