[PATCH 24/25] Don't ask if we have ESSID specified by kickstart or stage 1 (#473803)

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

 



---
 gui.py     |    2 ++
 network.py |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gui.py b/gui.py
index 50c542f..f7ee82f 100755
--- a/gui.py
+++ b/gui.py
@@ -993,6 +993,8 @@ class InstallInterface(InstallInterfaceBase):
                 # get available wireless APs
                 dev_all_ssids = self.anaconda.network.getSSIDs()
                 w.pop()
+                # prefer APs we already have set e.g. via kickstart or stage 1
+                self.anaconda.network.selectPreferredSSIDs(dev_all_ssids)
                 # select wireless APs
                 dev_ssids = selectSSIDsDialog(dev_all_ssids) or dev_all_ssids
                 self.anaconda.network.updateIfcfgsSSID(dev_ssids)
diff --git a/network.py b/network.py
index 9ad9338..9e46f00 100644
--- a/network.py
+++ b/network.py
@@ -507,6 +507,12 @@ class Network:
     def getSSIDs(self):
         return getSSIDs(self.netdevices.keys())
 
+    def selectPreferredSSIDs(self, dev_ssids):
+        for iface, device in self.netdevices.items():
+            preferred = device.get('ESSID')
+            if preferred and preferred in dev_ssids[iface]:
+                dev_ssids[iface] = [preferred]
+
     def writeKS(self, f):
         devNames = self.netdevices.keys()
         devNames.sort()
-- 
1.6.0.6

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

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux