summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-11-04 12:54:03 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-11-04 15:27:19 -1000
commit473d7bad963bc5c9f5483e3432a96b5bf7ef73a7 (patch)
treec415a721d28ff4a3bd925170023544f339ef5177
parent2350a33506445d78482db9b7e5d2ebd9e1e94e23 (diff)
downloadanaconda-473d7bad963bc5c9f5483e3432a96b5bf7ef73a7.tar.gz
anaconda-473d7bad963bc5c9f5483e3432a96b5bf7ef73a7.tar.xz
anaconda-473d7bad963bc5c9f5483e3432a96b5bf7ef73a7.zip
Prevent traceback when there are no network devices (#469339)
If a user boots from boot.iso, the installer will bring up the net config dialog to configure the network interface so packages can be found and installed. If a user has no available network devices, the window appears but nothing is in the combo box. If they click the combo box, you get a traceback. This patch returns False from all enableNetwork() functions so the user sees the 'No Network Available' dialog and is given the Exit Installer button.
-rwxr-xr-xgui.py2
-rw-r--r--rescue.py2
-rw-r--r--text.py2
3 files changed, 6 insertions, 0 deletions
diff --git a/gui.py b/gui.py
index eb356f400..2fcc9e987 100755
--- a/gui.py
+++ b/gui.py
@@ -1162,6 +1162,8 @@ class InstallInterface:
pass
def enableNetwork(self, anaconda):
+ if len(anaconda.id.network.netdevices) == 0:
+ return False
from netconfig_dialog import NetworkConfigurator
net = NetworkConfigurator(anaconda.id.network)
ret = net.run()
diff --git a/rescue.py b/rescue.py
index a9624ec11..67d573b1c 100644
--- a/rescue.py
+++ b/rescue.py
@@ -82,6 +82,8 @@ class RescueInterface:
return OkCancelWindow(self.screen, title, text)
def enableNetwork(self, anaconda):
+ if len(anaconda.id.network.netdevices) == 0:
+ return False
from netconfig_text import NetworkConfiguratorText
w = NetworkConfiguratorText(self.screen, anaconda)
ret = w.run()
diff --git a/text.py b/text.py
index 7b5796225..d3dd568f8 100644
--- a/text.py
+++ b/text.py
@@ -496,6 +496,8 @@ class InstallInterface:
return (passphrase, isglobal)
def enableNetwork(self, anaconda):
+ if len(anaconda.id.network.netdevices) == 0:
+ return False
from netconfig_text import NetworkConfiguratorText
w = NetworkConfiguratorText(self.screen, anaconda)
ret = w.run()