[PATCH rhel6-branch] Don't write vlan kickstart configuration to parent device ifcfg file (#903689)

Radek Vykydal rvykydal at redhat.com
Fri Jun 21 13:48:03 UTC 2013


From: Masahiro Matsuya <mmatsuya at redhat.com>

Resolves: rhbz#903689
---
 kickstart.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index e4b960a..c227822 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -646,6 +646,13 @@ class NetworkData(commands.network.RHEL6_NetworkData):
                 break
 
         dev = devices.get(device, None)
+        if self.vlanid:
+            devname = "%s.%s" % (device, self.vlanid)
+            # ifcfg file for vlan device was not created in loader
+            if devname not in devices:
+                log.info("vlan %s not configured, only supported for devices activated during installation" % devname)
+                return
+            dev = devices.get(devname, None)
 
         if self.hostname != "":
             anaconda.id.network.setHostname(self.hostname)
@@ -661,13 +668,6 @@ class NetworkData(commands.network.RHEL6_NetworkData):
             else:
                 raise KickstartValueError, formatErrorMsg(self.lineno, msg="The provided network interface %s does not exist" % device)
 
-        if self.vlanid:
-            devname = "%s.%s" % (device, self.vlanid)
-            # ifcfg file for vlan device was not created in loader
-            if devname not in devices:
-                log.info("vlan %s not configured, only supported for devices activated during installation" % devname)
-                return
-
         # ipv4 settings
         if not self.noipv4:
             dev.set(("BOOTPROTO", self.bootProto))
-- 
1.7.11.7



More information about the anaconda-patches mailing list