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

[PATCH] Do not raise UI dialog in stage2 if network is set in ks (#487503)



It concerns e.g. installation from media with ks on media. With the
patch the dialog is raised only if bringing-up with ks-supplied data
fails.
---
 gui.py  |    3 +++
 text.py |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/gui.py b/gui.py
index 3d75ae1..c4f697d 100755
--- a/gui.py
+++ b/gui.py
@@ -1161,6 +1161,9 @@ class InstallInterface:
     def enableNetwork(self, anaconda):
         if len(anaconda.id.network.netdevices) == 0:
             return False
+        if (anaconda.isKickstart and anaconda.id.ksdata.network
+            and anaconda.id.network.bringUp()):
+                return True
         from netconfig_dialog import NetworkConfigurator
         net = NetworkConfigurator(anaconda.id.network)
         ret = net.run()
diff --git a/text.py b/text.py
index fada4e2..388a97c 100644
--- a/text.py
+++ b/text.py
@@ -512,6 +512,9 @@ class InstallInterface:
     def enableNetwork(self, anaconda):
         if len(anaconda.id.network.netdevices) == 0:
             return False
+        if (anaconda.isKickstart and anaconda.id.ksdata.network
+            and anaconda.id.network.bringUp()):
+                return True
         from netconfig_text import NetworkConfiguratorText
         w = NetworkConfiguratorText(self.screen, anaconda)
         ret = w.run()
-- 
1.6.0.6


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