[Mageia-sysadm] [405] Merge mdv commit 271832

[root at mageia.org]

Revision: 405
Author:   dmorgan
Date:     2011-02-03 20:54:25 +0100 (Thu, 03 Feb 2011)
Log Message:
-----------
Merge mdv commit 271832

Modified Paths:
--------------
    drakx-net/trunk/lib/network/connection.pm
    drakx-net/trunk/lib/network/network.pm

Modified: drakx-net/trunk/lib/network/connection.pm
===================================================================
--- drakx-net/trunk/lib/network/connection.pm	2011-02-03 19:29:58 UTC (rev 404)
+++ drakx-net/trunk/lib/network/connection.pm	2011-02-03 19:54:25 UTC (rev 405)
@@ -150,6 +150,7 @@
     $self->{control}{metric} = $self->{ifcfg}{METRIC};
     $self->{control}{mtu} = $self->{ifcfg}{MTU};
     $self->{control}{accounting} = $self->{ifcfg}{ACCOUNTING};
+    $self->{control}{nm_controlled} = $self->{ifcfg}{NM_CONTROLLED};
 }
 
 #- override to return 1 if the connection network scan is slow
@@ -243,6 +244,7 @@
         { 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" },
         { 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.") },
@@ -255,6 +257,7 @@
         DEVICE => $self->get_interface,
         ONBOOT => bool2yesno($self->{control}{onboot}),
         ACCOUNTING => bool2yesno($self->{control}{accounting}),
+        NM_CONTROLLED => bool2yesno($self->{control}{nm_controlled}),
         USERCTL => bool2yesno($self->{control}{userctl}),
         METRIC => $self->{control}{metric},
         MTU => $self->{control}{mtu},

Modified: drakx-net/trunk/lib/network/network.pm
===================================================================
--- drakx-net/trunk/lib/network/network.pm	2011-02-03 19:29:58 UTC (rev 404)
+++ drakx-net/trunk/lib/network/network.pm	2011-02-03 19:54:25 UTC (rev 405)
@@ -192,6 +192,7 @@
                 qw(DISCONNECTTIMEOUT PERSIST DEFROUTE),
                 qw(VPN_NAME VPN_TYPE),
                 qw(ACCOUNTING),
+                qw(NM_CONTROLLED),
                 qw(CELLULAR_CID),
                 if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_CLIENT DHCP_HOSTNAME NEEDHOSTNAME PEERDNS PEERYP PEERNTPD DHCP_TIMEOUT)),
                 if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_IFUP))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html>