Attachment 1347 Details for Bug 1138 – prevent enabling NM at install time

[patch] prevent enabling NM at install time

1138-2.diff (text/plain), 1.07 KB, created by Thierry Vignaud on 2012-01-08 15:03:42 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2012-01-08 15:03:42 CET

Size: 1.07 KB

patch

obsolete

>diff --git a/lib/network/connection.pm b/lib/network/connection.pm
>index 6cf3036..a12e65a 100644
>--- a/lib/network/connection.pm
>+++ b/lib/network/connection.pm
>@@ -246,7 +246,7 @@ sub get_control_settings {
>         { text => N("Allow users to manage the connection"), val => \$self->{control}{userctl}, type => "bool" },
>         { text => N("Start the connection at boot"), val => \$self->{control}{onboot}, type => "bool" },
>         { text => N("Enable traffic accounting"), val => \$self->{control}{accounting}, type => "bool" },
>-        { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool" },
>+        { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool", disabled => sub { $::isInstall } },
>         { label => N("Metric"), val => \$self->{control}{metric}, advanced => 1 },
>         { label => N("MTU"), val => \$self->{control}{mtu}, advanced => 1,
>           help => N("Maximum size of network message (MTU). If unsure, left blank.") },

diff --git a/lib/network/connection.pm b/lib/network/connection.pm
index 6cf3036..a12e65a 100644
--- a/lib/network/connection.pm
+++ b/lib/network/connection.pm
@@ -246,7 +246,7 @@ sub get_control_settings {
         { text => N("Allow users to manage the connection"), val => \$self->{control}{userctl}, type => "bool" },
         { text => N("Start the connection at boot"), val => \$self->{control}{onboot}, type => "bool" },
         { text => N("Enable traffic accounting"), val => \$self->{control}{accounting}, type => "bool" },
-        { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool" },
+        { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool", disabled => sub { $::isInstall } },
         { label => N("Metric"), val => \$self->{control}{metric}, advanced => 1 },
         { label => N("MTU"), val => \$self->{control}{mtu}, advanced => 1,
           help => N("Maximum size of network message (MTU). If unsure, left blank.") },

Actions: View | Diff

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