]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
network/parse-ip-opts.sh: fix ifname for ibft with all args
authorHarald Hoyer <harald@redhat.com>
Tue, 26 Apr 2011 21:22:41 +0000 (23:22 +0200)
committerHarald Hoyer <harald@redhat.com>
Mon, 2 May 2011 09:30:29 +0000 (11:30 +0200)
modules.d/40network/parse-ip-opts.sh

index 4c3d0c24a8072acce84e8454794ad30655149ec6..608fc88a0c9a203d9d5c9be0c1483bdec9ddb921 100755 (executable)
@@ -59,16 +59,19 @@ if [ "ibft" = "$(getarg ip=)" ]; then
            [ -e ${iface}/mac ] || continue
             ifname_mac=$(read a < ${iface}/mac; echo $a)
            [ -z "$ifname_mac" ] && continue
+            unset dev
             for ifname in $(getargs ifname=); do
                if strstr "$ifname" "$ifname_mac"; then
                    dev=${ifname%%:*}
-               else
-                   ifname_if=ibft$num
-                   num=$(( $num + 1 ))
-                   echo "ifname=$ifname_if:$ifname_mac"
-                   dev=$ifname_if
-               fi
+                    break
+                fi
            done
+            if [ -z "$dev" ]; then
+               ifname_if=ibft$num
+               num=$(( $num + 1 ))
+               echo "ifname=$ifname_if:$ifname_mac"
+               dev=$ifname_if
+           fi
 
            dhcp=$(read a < ${iface}/dhcp; echo $a)
            if [ -n "$dhcp" ]; then