Attachment 1330 Details for Bug 1138 – disable NM by default while installing (mga#1138)

[patch] disable NM by default while installing (mga#1138)

1138.diff (text/plain), 1.03 KB, created by Thierry Vignaud on 2012-01-04 14:44:07 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2012-01-04 14:44:07 CET

Size: 1.03 KB

patch

obsolete

>(load_interface_settings) disable NM by default while installing (mga#1138)
>
>diff --git a/NEWS b/NEWS
>index 5116780..d1beba2 100644
>--- a/NEWS
>+++ b/NEWS
>@@ -1,2 +1,4 @@
>+- disable NM by default while installing (mga#1138)
>+
> 1.3:
> - hostname: update the /etc/hostname (new x-distro standard) file on hostname
>diff --git a/lib/network/connection.pm b/lib/network/connection.pm
>index 6cf3036..786a433 100644
>--- a/lib/network/connection.pm
>+++ b/lib/network/connection.pm
>@@ -149,7 +149,7 @@ sub load_interface_settings {
>     $self->{control}{metric} = $self->{ifcfg}{METRIC};
>     $self->{control}{mtu} = $self->{ifcfg}{MTU};
>     $self->{control}{accounting} = $self->get_ifcfg_bool('ACCOUNTING');
>-    $self->{control}{nm_controlled} = $self->get_ifcfg_bool('NM_CONTROLLED');
>+    $self->{control}{nm_controlled} = $::isInstall ? 0 || $self->get_ifcfg_bool('NM_CONTROLLED');
>     $self->{control}{uuid} = $self->{ifcfg}{UUID};
>     $self->{control}{name} = $self->{ifcfg}{NAME};
>     $self->{control}{last_connect} = $self->{ifcfg}{LAST_CONNECT};

(load_interface_settings) disable NM by default while installing (mga#1138)

diff --git a/NEWS b/NEWS
index 5116780..d1beba2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,4 @@
+- disable NM by default while installing (mga#1138)
+
 1.3:
 - hostname: update the /etc/hostname (new x-distro standard) file on hostname
diff --git a/lib/network/connection.pm b/lib/network/connection.pm
index 6cf3036..786a433 100644
--- a/lib/network/connection.pm
+++ b/lib/network/connection.pm
@@ -149,7 +149,7 @@ sub load_interface_settings {
     $self->{control}{metric} = $self->{ifcfg}{METRIC};
     $self->{control}{mtu} = $self->{ifcfg}{MTU};
     $self->{control}{accounting} = $self->get_ifcfg_bool('ACCOUNTING');
-    $self->{control}{nm_controlled} = $self->get_ifcfg_bool('NM_CONTROLLED');
+    $self->{control}{nm_controlled} = $::isInstall ? 0 || $self->get_ifcfg_bool('NM_CONTROLLED');
     $self->{control}{uuid} = $self->{ifcfg}{UUID};
     $self->{control}{name} = $self->{ifcfg}{NAME};
     $self->{control}{last_connect} = $self->{ifcfg}{LAST_CONNECT};

Actions: View | Diff

Attachments on bug 1138: 473 | 474 | 475 | 476 | 477 | 478 | 479 | 480 | 1330 | 1347