[PATCH rhel7-branch] fcoe: add fcoe=<NIC>:<EDB> to boot options for nics added manually (#1040215)
Radek Vykydal
rvykydal at redhat.com
Wed Jan 22 09:07:09 UTC 2014
Resolves: rhbz#1040215
---
pyanaconda/kickstart.py | 11 +++++++++--
pyanaconda/ui/gui/spokes/advstorage/fcoe.py | 1 +
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 41b4736..c5588d0 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -527,9 +527,16 @@ class Fcoe(commands.fcoe.F13_Fcoe):
if fc.nic not in nm.nm_devices():
raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified nonexistent nic %s in fcoe command" % fc.nic)
- msg = blivet.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=True) or "Succeeded."
+ if fc.nic in (info[0] for info in blivet.fcoe.fcoe().nics):
+ log.info("Kickstart fcoe device %s already added from EDD, ignoring"
+ % fc.nic)
+ else:
+ msg = blivet.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=True)
+ if not msg:
+ msg = "Succeeded."
+ blivet.fcoe.fcoe().added_nics.append(fc.nic)
- log.info("adding FCoE SAN on %s: %s" % (fc.nic, msg))
+ log.info("adding FCoE SAN on %s: %s" % (fc.nic, msg))
return fc
diff --git a/pyanaconda/ui/gui/spokes/advstorage/fcoe.py b/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
index cde8969..4ff6925 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/fcoe.py
@@ -116,6 +116,7 @@ class FCoEDialog(GUIObject):
self._cancelButton.set_sensitive(True)
else:
# Success. There's nothing else the user can do on this dialog.
+ self.fcoe.added_nics.append(self.nic)
self._update_devicetree = True
self.window.response(1)
--
1.7.11.7
More information about the anaconda-patches
mailing list