[rhel7-branch 1/1] ibft: fix setting dracut boot args for static ibft nic configuration (#1267526)

rvykydal installerbot-noreply at redhat.com
Wed Oct 7 08:29:01 UTC 2015


From: Radek Vykydal <rvykydal at redhat.com>

ip=ibft was not passed to dracut.

Resolves: rhbz#1267526
---
 pyanaconda/network.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 678e631..5d8e6c3 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -949,8 +949,14 @@ def get_team_slaves(master_specs):
 def ibftIface():
     iface = ""
     ipopt = flags.cmdline.get('ip')
-    if ipopt and ipopt.startswith('ibft'):
-        iface = ipopt.split(":")[0]
+    # Examples (dhcp, static):
+    # ibft0:dhcp
+    # 10.34.102.244::10.34.102.54:255.255.255.0::ibft0:none
+    if ipopt:
+        for item in ipopt.split(":"):
+            if item.startswith('ibft'):
+                iface = item
+                break
     return iface
 
 def ifaceForHostIP(host):


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/15d70219d1873e928096a14e43002734e8f6ce9c


More information about the anaconda-patches mailing list