From 7dcf615a868fbcb6f52abc2a54cfe70fba7b1e78 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 7 Mar 2018 14:55:46 +0100 Subject: [ib-conf] if VLAN is configured, use the ip of the vlan interface to determine the suffix for the ib interface --- builder/modules.d/ib-conf/scripts/gen-ib-conf.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh b/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh index f0bd2c7c..b168ce06 100755 --- a/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh +++ b/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh @@ -4,6 +4,9 @@ type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh . "/run/openslx/pxe-network.conf" +# get the IP from the VLAN device if a VLAN is configured +[ -n "${SLX_VLAN_ID}" ] && SLX_PXE_NETIF="${SLX_PXE_NETIF}.${SLX_VLAN_ID}" + IPSUFFIX=$( ip -4 -o addr show dev "${SLX_PXE_NETIF}" | \ awk '{split($4,a,"/");split(a[1],b,".");print b[3]"."b[4]}' -- cgit v1.2.3-55-g7522