Port from rhel6-branch
Resolves: rhbz#1055779 --- anaconda.spec.in | 2 +- pyanaconda/kickstart.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in index f6d2436..74794c1 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -21,7 +21,7 @@ Source0: %{name}-%{version}.tar.bz2 %define gconfversion 2.28.1 %define intltoolver 0.31.2-3 %define libnlver 1.0 -%define pykickstartver 1.99.43.4 +%define pykickstartver 1.99.43.8 %define yumver 3.4.3-91 %define partedver 1.8.1 %define pypartedver 2.5-2 diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index c5588d0..aa8c9b2 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -520,9 +520,9 @@ class ClearPart(commands.clearpart.F17_ClearPart):
storage.clearPartitions()
-class Fcoe(commands.fcoe.F13_Fcoe): +class Fcoe(commands.fcoe.RHEL7_Fcoe): def parse(self, args): - fc = commands.fcoe.F13_Fcoe.parse(self, args) + fc = commands.fcoe.RHEL7_Fcoe.parse(self, args)
if fc.nic not in nm.nm_devices(): raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified nonexistent nic %s in fcoe command" % fc.nic) @@ -531,7 +531,7 @@ class Fcoe(commands.fcoe.F13_Fcoe): 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) + msg = blivet.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=fc.autovlan) if not msg: msg = "Succeeded." blivet.fcoe.fcoe().added_nics.append(fc.nic)
Port from rhel6-branch
Related: rhbz#1055779 --- pykickstart/commands/fcoe.py | 25 +++++++++++++++++++++++++ pykickstart/handlers/control.py | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py index 95fa077..b377b86 100644 --- a/pykickstart/commands/fcoe.py +++ b/pykickstart/commands/fcoe.py @@ -70,6 +70,22 @@ class F13_FcoeData(F12_FcoeData):
return retval
+class RHEL7_FcoeData(F13_FcoeData): + removedKeywords = F13_FcoeData.removedKeywords + removedAttrs = F13_FcoeData.removedAttrs + + def __init__(self, *args, **kwargs): + F13_FcoeData.__init__(self, *args, **kwargs) + self.autovlan = kwargs.get("autovlan", False) + + def _getArgsAsStr(self): + retval = F13_FcoeData._getArgsAsStr(self) + + if self.autovlan: + retval += " --autovlan" + + return retval + class F12_Fcoe(KickstartCommand): removedKeywords = KickstartCommand.removedKeywords removedAttrs = KickstartCommand.removedAttrs @@ -118,3 +134,12 @@ class F13_Fcoe(F12_Fcoe): op = F12_Fcoe._getParser(self) op.add_option("--dcb", dest="dcb", action="store_true", default=False) return op + +class RHEL7_Fcoe(F13_Fcoe): + removedKeywords = F13_Fcoe.removedKeywords + removedAttrs = F13_Fcoe.removedAttrs + + def _getParser(self): + op = F13_Fcoe._getParser(self) + op.add_option("--autovlan", dest="autovlan", action="store_true", default=False) + return op diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py index 5f9b95c..7f9efb8 100644 --- a/pykickstart/handlers/control.py +++ b/pykickstart/handlers/control.py @@ -1328,7 +1328,7 @@ commandMap = { "dmraid": dmraid.FC6_DmRaid, "driverdisk": driverdisk.F14_DriverDisk, "eula": eula.F20_Eula, - "fcoe": fcoe.F13_Fcoe, + "fcoe": fcoe.RHEL7_Fcoe, "firewall": firewall.F20_Firewall, "firstboot": firstboot.FC3_Firstboot, "graphical": displaymode.FC3_DisplayMode, @@ -1612,7 +1612,7 @@ dataMap = { "DriverDiskData": driverdisk.F14_DriverDiskData, "DeviceData": device.F8_DeviceData, "DmRaidData": dmraid.FC6_DmRaidData, - "FcoeData": fcoe.F13_FcoeData, + "FcoeData": fcoe.RHEL7_FcoeData, "GroupData": group.F12_GroupData, "IscsiData": iscsi.F17_IscsiData, "LogVolData": logvol.F18_LogVolData,
anaconda-patches@lists.fedorahosted.org
-
Chris Lumens -
Radek Vykydal