Resolves: rhbz#813998 --- anaconda.spec.in | 2 +- kickstart.py | 2 +- storage/fcoe.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in index cbe065d..f2fb625 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define intltoolver 0.31.2-3 %define libnlver 1.0 %define libselinuxver 1.6 -%define pykickstartver 1.74.11 +%define pykickstartver 1.74.12 %define rpmpythonver 4.2-0.61 %define slangver 2.0.6-2 %define yumver 2.9.2 diff --git a/kickstart.py b/kickstart.py index a180c8f..c5d331c 100644 --- a/kickstart.py +++ b/kickstart.py @@ -363,7 +363,7 @@ class Fcoe(commands.fcoe.F13_Fcoe): log.info("Kickstart fcoe device %s already added from EDD, ignoring" % fc.nic) else: - storage.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=True) + storage.fcoe.fcoe().addSan(nic=fc.nic, dcb=fc.dcb, auto_vlan=fc.autovlan) storage.fcoe.fcoe().ksnics.append(fc.nic)
return fc diff --git a/storage/fcoe.py b/storage/fcoe.py index 4206726..75c932b 100644 --- a/storage/fcoe.py +++ b/storage/fcoe.py @@ -153,6 +153,8 @@ class fcoe(object): line = "fcoe --nic %s" % nic if dcb: line += " --dcb" + if auto_vlan: + line += " --autovlan" line += "\n" f.write(line)