[PATCH rhel7-branch] Add support for fcoe --autovlan option (#1055779)

Radek Vykydal rvykydal at redhat.com
Tue Feb 4 15:34:51 UTC 2014


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)
-- 
1.7.11.7



More information about the anaconda-patches mailing list