From: Marian Ganisin <mganisin@redhat.com>
Date: Fri, 22 Apr 2011 12:48:36 +0000 (-0400)
Subject: don't overwrite ifname=
X-Git-Tag: 011~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c34130f705edf2210ae6f77ddead3fd5baacb124;p=platform%2Fupstream%2Fdracut.git

don't overwrite ifname=

[Harald Hoyer <harald@redhat.com>: replaced grep with strstr]
[Harald Hoyer <harald@redhat.com>: handle multiple ifname= arguments]
---

diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
index d7b7f37..4c3d0c2 100755
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.sh
@@ -54,15 +54,21 @@ fi
 if [ "ibft" = "$(getarg ip=)" ]; then
     modprobe iscsi_ibft
     num=0
-    (   
+    (
 	for iface in /sys/firmware/ibft/ethernet*; do
 	    [ -e ${iface}/mac ] || continue
             ifname_mac=$(read a < ${iface}/mac; echo $a)
 	    [ -z "$ifname_mac" ] && continue
-            ifname_if=ibft$num
-	    num=$(( $num + 1 ))
-	    echo "ifname=$ifname_if:$ifname_mac"
-	    dev=$ifname_if
+            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
+	    done
 
 	    dhcp=$(read a < ${iface}/dhcp; echo $a)
 	    if [ -n "$dhcp" ]; then