[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



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

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 0d3db65..40d99b9 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -582,6 +582,13 @@ class NetworkData(commands.network.F16_NetworkData):
             # Only set hostname
             return
 
+        # we can ignore this here (already activated in stage 1)
+        # only set hostname
+        if self.essid:
+            if self.hostname != "":
+                self.anaconda.network.setHostname(self.hostname)
+            return
+
         devices = self.anaconda.network.netdevices
 
         if not self.device:
@@ -671,14 +678,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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]