[PATCH 4/5] do not care about wifi connections in kickstart (already active from stage1)

[Vratislav Podzimek <vpodzime@xxxxxxxxxx>]

---
 pyanaconda/kickstart.py |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index a0adaa3..7bd09c0 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -562,6 +562,10 @@ class NetworkData(commands.network.F16_NetworkData):
             # Only set hostname
             return
 
+        # we can ignore this here (already activated in stage 1)
+        if self.essid:
+            return
+
         devices = self.anaconda.network.netdevices
 
         if not self.device:
@@ -651,14 +655,6 @@ class NetworkData(commands.network.F16_NetworkData):
             if self.ethtool:
                 dev.set(("ETHTOOL_OPTS", self.ethtool))
 
-            if isys.isWirelessDevice(device):
-                if self.essid:
-                    dev.set(("ESSID", self.essid))
-                if self.wepkey:
-                    dev.set(("DEFAULTKEY", "1"))
-                    dev.wepkey = self.wepkey
-                    dev.writeWepkeyFile()
-
             if self.nameserver != "":
                 self.anaconda.network.setDNS(self.nameserver, dev.iface)
 
-- 
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list