summaryrefslogtreecommitdiffstats
path: root/textw
diff options
context:
space:
mode:
authorRadek Vykydal <rvykydal@redhat.com>2010-04-23 16:42:29 +0200
committerRadek Vykydal <rvykydal@redhat.com>2010-05-13 13:20:36 +0200
commit8d1873ead9faecadbd0d6140712d9bb54234f3f0 (patch)
tree8194ed10e26140a8fb71a2bd34a9bea306de1591 /textw
parent57c08c86c71560cad68bd1dd4d01f5492542a696 (diff)
downloadanaconda-8d1873ead9faecadbd0d6140712d9bb54234f3f0.tar.gz
anaconda-8d1873ead9faecadbd0d6140712d9bb54234f3f0.tar.xz
anaconda-8d1873ead9faecadbd0d6140712d9bb54234f3f0.zip
Enable networking in stage 2 using nm-c-e (#520146)
Key patch of series. enableNetwork method is the root of all other changes in the patchset. The method is used both for network enabling in stage 2 triggered by need of network (repos, network storage, etc..) and [Configure Network] button What we select in stage 2 network UI is: - device to be activated (only in case of network enabling), this is controlled by ONBOOT ifcfg setting, note that devices actually activated depend on editing in nm-c-e - devices to be controlled by NM (and thus visible in nm-c-e), this is set by NM_CONTROLLED ifcfg setting A dialog for that is part of the patch, it needs some polishing. bringUp method had to be split into write and waitForConnection because in case of just config, without actually activating any device in nm-c-e, we don't want to wait for activation.
Diffstat (limited to 'textw')
-rw-r--r--textw/netconfig_text.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/textw/netconfig_text.py b/textw/netconfig_text.py
index fb3742978..41c037691 100644
--- a/textw/netconfig_text.py
+++ b/textw/netconfig_text.py
@@ -196,8 +196,10 @@ class NetworkConfiguratorText:
for name, dev in netdevs.items():
if name in selected:
+ dev.set(('NM_CONTROLLED', 'yes'))
dev.set(('ONBOOT', 'yes'))
else:
+ dev.set(('NM_CONTROLLED', 'no'))
dev.set(('ONBOOT', 'no'))
selected_netdevs = []