From 36874847061a9bcd906ab271e314c7f1dbebf5b9 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 27 Aug 2019 14:21:08 +0200 Subject: [slx-network] only try to set ip address if SLX_PXE_CLIENT_IP is set --- .../modules.d/slx-network/scripts/setup-bootif-network.stage3 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 index b98829e9..4535ccd3 100755 --- a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 +++ b/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 @@ -81,10 +81,12 @@ if [ -n "$SLX_BRIDGE" ]; then fi # finally add the IP address on the main NIC -ip addr add \ - "${SLX_PXE_CLIENT_IP}/$(ipcalc -s -p "$SLX_PXE_CLIENT_IP" "$SLX_PXE_NETMASK" | sed "s/.*=//")" \ - broadcast "$(ipcalc -s -b "$SLX_PXE_CLIENT_IP" "$SLX_PXE_NETMASK" | sed "s/.*=//")" \ - dev "$MAIN_NETIF" +if [ -n "$SLX_PXE_CLIENT_IP" ]; then + ip addr add \ + "${SLX_PXE_CLIENT_IP}/$(ipcalc -s -p "$SLX_PXE_CLIENT_IP" "$SLX_PXE_NETMASK" | sed "s/.*=//")" \ + broadcast "$(ipcalc -s -b "$SLX_PXE_CLIENT_IP" "$SLX_PXE_NETMASK" | sed "s/.*=//")" \ + dev "$MAIN_NETIF" +fi if [ "$USE_DHCP_UUID" = "yes" ] && [ -s "/run/system-uuid" ]; then UUID="$(cat /run/system-uuid)" -- cgit v1.2.3-55-g7522