summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDexter Morgan <dmorgan@mageia.org>2011-02-03 20:01:53 +0000
committerDexter Morgan <dmorgan@mageia.org>2011-02-03 20:01:53 +0000
commitb2086b006baddd6f8a9b09c4cbff7c103ed04d42 (patch)
tree01aa18ea7eb1e939959ad527fb7af3b5150f397b /lib
parent3e04d9cf084c859f400d2aadf9a592ea82ad9939 (diff)
downloaddrakx-net-b2086b006baddd6f8a9b09c4cbff7c103ed04d42.tar
drakx-net-b2086b006baddd6f8a9b09c4cbff7c103ed04d42.tar.gz
drakx-net-b2086b006baddd6f8a9b09c4cbff7c103ed04d42.tar.bz2
drakx-net-b2086b006baddd6f8a9b09c4cbff7c103ed04d42.tar.xz
drakx-net-b2086b006baddd6f8a9b09c4cbff7c103ed04d42.zip
Keep UUID, NAME and LAST_CONNECT for NetworkManager to work correctly.
Merge mdv commit 271837
Diffstat (limited to 'lib')
-rw-r--r--lib/network/connection.pm6
-rw-r--r--lib/network/network.pm1
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/network/connection.pm b/lib/network/connection.pm
index dd784b6..837ab97 100644
--- a/lib/network/connection.pm
+++ b/lib/network/connection.pm
@@ -151,6 +151,9 @@ sub load_interface_settings {
$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 @@ sub build_ifcfg_settings {
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
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 2ff65be..565e438 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -193,6 +193,7 @@ sub write_interface_settings {
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))