This is only for [Configure Network] button, otoh when enabling network,
still offer pre-nmce dialog to inform user that he needs to configure
network.
---
gui.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gui.py b/gui.py
index 6d7ecc9..1008d93 100755
--- a/gui.py
+++ b/gui.py
@@ -955,6 +955,7 @@ class InstallInterface(InstallInterfaceBase):
# TODORV: handle one device case - don't ask
+ # just_setup is used for [Configure Network] button
def enableNetwork(self, just_setup=False):
if len(self.anaconda.network.netdevices) == 0:
@@ -965,11 +966,15 @@ class InstallInterface(InstallInterfaceBase):
networkEnabled = False
while not networkEnabled:
- choice = selectNetDevicesDialog(self.anaconda.network,
- select_install_device=(not just_setup))
- if not choice:
- break
- nm_controlled_devices, install_device = choice
+ if just_setup and len(self.anaconda.network.netdevices) <= 1:
+ nm_controlled_devices = self.anaconda.network.netdevices.keys()
+ install_device = None
+ else:
+ choice = selectNetDevicesDialog(self.anaconda.network,
+ select_install_device=(not just_setup))
+ if not choice:
+ break
+ nm_controlled_devices, install_device = choice
# update ifcfg files for nm-c-e
self.anaconda.network.setNMControlledDevices(nm_controlled_devices)
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
