diff options
Diffstat (limited to 'pyanaconda/gui.py')
| -rwxr-xr-x | pyanaconda/gui.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py index 3f9e2a306..b5977fa61 100755 --- a/pyanaconda/gui.py +++ b/pyanaconda/gui.py @@ -899,21 +899,26 @@ class InstallInterface(InstallInterfaceBase): if len(self.anaconda.network.netdevices) == 0: return False + nm_controlled_devices = [devname for (devname, dev) + in self.anaconda.id.network.netdevices.items() + if not dev.usedByFCoE(self.anaconda)] + if not just_setup and not nm_controlled_devices: + return False + from iw.network_gui import (runNMCE, - selectNetDevicesDialog, + selectInstallNetDeviceDialog, selectSSIDsDialog) networkEnabled = False while not networkEnabled: - if just_setup and len(self.anaconda.network.netdevices) <= 1: - nm_controlled_devices = self.anaconda.network.netdevices.keys() + + if just_setup: install_device = None else: - choice = selectNetDevicesDialog(self.anaconda.network, - select_install_device=(not just_setup)) - if not choice: + install_device = selectInstallNetDeviceDialog(self.anaconda.network, + nm_controlled_devices) + if not install_device: break - nm_controlled_devices, install_device = choice # update ifcfg files for nm-c-e self.anaconda.network.setNMControlledDevices(nm_controlled_devices) |