From d672bf167c08fa8d12cee0616df781fbba5ad3b0 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 5 Sep 2012 16:54:04 -0700 Subject: [PATCH] network: fix ip=ibft regression It looks like ip=ibft has been busted since 25aa3c5 network: refactor stuff from netroot/parse-ip-opts to net-lib which moved ibft parsing code out to the ibft_to_cmdline function. The use of ifname_mac was partially replaced by a local mac, but not completely, causing ibft_to_cmdline to abort without generating network configuration options. Signed-off-by: Chris Leech --- modules.d/40network/net-lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh index 641b21e7..10b630e5 100644 --- a/modules.d/40network/net-lib.sh +++ b/modules.d/40network/net-lib.sh @@ -145,8 +145,8 @@ ibft_to_cmdline() { for iface in /sys/firmware/ibft/ethernet*; do [ -e ${iface}/mac ] || continue mac=$(read a < ${iface}/mac; echo $a) - [ -z "$ifname_mac" ] && continue - dev=$(set_ifname ibft $ifname_mac) + [ -z "$mac" ] && continue + dev=$(set_ifname ibft $mac) dhcp=$(read a < ${iface}/dhcp; echo $a) if [ -n "$dhcp" ]; then echo "ip=$dev:dhcp"