[Mageia-sysadm] [409] Merge mdv commit 271837

[root at mageia.org]

Revision: 409
Author:   dmorgan
Date:     2011-02-03 21:01:53 +0100 (Thu, 03 Feb 2011)
Log Message:
-----------
Merge mdv commit 271837

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:57:59 UTC (rev 408)
+++ drakx-net/trunk/lib/network/connection.pm	2011-02-03 20:01:53 UTC (rev 409)
@@ -151,6 +151,9 @@
     $self->{control}{mtu} = $self->{ifcfg}{MTU};
     $self->{control}{accounting} = $self->{ifcfg}{ACCOUNTING};
     $self->{control}{nm_controlled} = $self->{ifcfg}{NM_CONTROLLED};
+    $self->{control}{uuid} = $self->{ifcfg}{UUID};
+    $self->{control}{name} = $self->{ifcfg}{NAME};
+    $self->{control}{last_connect} = $self->{ifcfg}{LAST_CONNECT};
 }
 
 #- override to return 1 if the connection network scan is slow
@@ -261,6 +264,9 @@
         USERCTL => bool2yesno($self->{control}{userctl}),
         METRIC => $self->{control}{metric},
         MTU => $self->{control}{mtu},
+        UUID => $self->{control}{uuid},
+        NAME => $self->{control}{name},
+        LAST_CONNECT => $self->{control}{last_connect},
         VPN_TYPE => defined $self->{control}{vpn} && $self->{control}{vpn}->get_type,
         VPN_NAME => defined $self->{control}{vpn} && $self->{control}{vpn}->get_name,
         #- FIXME: add MS_DNSx variables if DNS servers are specified

Modified: drakx-net/trunk/lib/network/network.pm
===================================================================
--- drakx-net/trunk/lib/network/network.pm	2011-02-03 19:57:59 UTC (rev 408)
+++ drakx-net/trunk/lib/network/network.pm	2011-02-03 20:01:53 UTC (rev 409)
@@ -193,6 +193,7 @@
                 qw(VPN_NAME VPN_TYPE),
                 qw(ACCOUNTING),
                 qw(NM_CONTROLLED),
+                qw(UUID NAME LAST_CONNECT),
                 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/8b9bc5c2/attachment.html>