Mageia Bugzilla – Attachment 4878 Details for
Bug 9261
Draklive-install - After reboot, configuring network fails to connect - NM grabs remaining interfaces
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Don't set NM_CONTROLLED unless we know it's value.
0001-ifcfg-Do-not-write-the-NM_CONTROLLED-flag-unless-we-.patch (text/plain), 1.84 KB, created by
Colin Guthrie
on 2014-01-25 17:27:27 CET
(
hide
)
Description:
Don't set NM_CONTROLLED unless we know it's value.
Filename:
MIME Type:
Creator:
Colin Guthrie
Created:
2014-01-25 17:27:27 CET
Size:
1.84 KB
patch
obsolete
>From 88b5da3663e5ebb48ee6a842dbf9c6f814dd8dbf Mon Sep 17 00:00:00 2001 >From: Colin Guthrie <colin@mageia.org> >Date: Fri, 24 Jan 2014 09:57:13 +0000 >Subject: [PATCH] ifcfg: Do not write the NM_CONTROLLED flag unless we know > it's value. > >If it's not read from the config, it will be read as undef, but written >back as 'no'. This changes the behaviour where no setting means >'automatic' - i.e. if NM is installed, use it, otherwise don't. > >If the user wants to be specific, then they make the consious choice >to tick the box in drakx-net. > >mga#6675 mga#9261 >--- > NEWS | 3 +++ > lib/network/connection.pm | 3 ++- > 2 files changed, 5 insertions(+), 1 deletion(-) > >diff --git a/NEWS b/NEWS >index 41d969d..8623c65 100644 >--- a/NEWS >+++ b/NEWS >@@ -1,3 +1,6 @@ >+- do now write NM_CONTROLLED flag in configs if it's not been explicitly set. >+ This allows, e.g. NM to run on gnome live CD/DVDs. Drak tools will still >+ work fine when NM is not installed. mga#6675 mga#9261 > - do not exec pkexec but run it so it has a parent process to fix double fork > issues mga#11184 mga#12364 > >diff --git a/lib/network/connection.pm b/lib/network/connection.pm >index 5cab3ac..443c0e4 100644 >--- a/lib/network/connection.pm >+++ b/lib/network/connection.pm >@@ -269,7 +269,8 @@ sub build_ifcfg_settings { > DEVICE => $self->get_interface, > ONBOOT => bool2yesno($self->{control}{onboot}), > ACCOUNTING => bool2yesno($self->{control}{accounting}), >- NM_CONTROLLED => bool2yesno($self->{control}{nm_controlled}), >+ # Only write NM_CONTROLLED if we absolutely know it's value >+ if_(defined $self->{control}{nm_controlled}, NM_CONTROLLED => bool2yesno($self->{control}{nm_controlled})), > USERCTL => bool2yesno($self->{control}{userctl}), > METRIC => $self->{control}{metric}, > MTU => $self->{control}{mtu}, >-- >1.8.4.5 >
From 88b5da3663e5ebb48ee6a842dbf9c6f814dd8dbf Mon Sep 17 00:00:00 2001 From: Colin Guthrie <colin@mageia.org> Date: Fri, 24 Jan 2014 09:57:13 +0000 Subject: [PATCH] ifcfg: Do not write the NM_CONTROLLED flag unless we know it's value. If it's not read from the config, it will be read as undef, but written back as 'no'. This changes the behaviour where no setting means 'automatic' - i.e. if NM is installed, use it, otherwise don't. If the user wants to be specific, then they make the consious choice to tick the box in drakx-net. mga#6675 mga#9261 --- NEWS | 3 +++ lib/network/connection.pm | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 41d969d..8623c65 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +- do now write NM_CONTROLLED flag in configs if it's not been explicitly set. + This allows, e.g. NM to run on gnome live CD/DVDs. Drak tools will still + work fine when NM is not installed. mga#6675 mga#9261 - do not exec pkexec but run it so it has a parent process to fix double fork issues mga#11184 mga#12364 diff --git a/lib/network/connection.pm b/lib/network/connection.pm index 5cab3ac..443c0e4 100644 --- a/lib/network/connection.pm +++ b/lib/network/connection.pm @@ -269,7 +269,8 @@ sub build_ifcfg_settings { DEVICE => $self->get_interface, ONBOOT => bool2yesno($self->{control}{onboot}), ACCOUNTING => bool2yesno($self->{control}{accounting}), - NM_CONTROLLED => bool2yesno($self->{control}{nm_controlled}), + # Only write NM_CONTROLLED if we absolutely know it's value + if_(defined $self->{control}{nm_controlled}, NM_CONTROLLED => bool2yesno($self->{control}{nm_controlled})), USERCTL => bool2yesno($self->{control}{userctl}), METRIC => $self->{control}{metric}, MTU => $self->{control}{mtu}, -- 1.8.4.5
View Attachment As Raw
Actions:
View
Attachments on
bug 9261
: 4878