From 360f3b5937e1fb1ff173240ec5c3ee9f8e9f9491 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Fri, 24 Jan 2014 09:57:13 +0000
Subject: 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
---
 lib/network/connection.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

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},
-- 
cgit v1.2.1