1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [409] Merge mdv commit 271837
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B409%5D%20Merge%20mdv%20commit%20271837&In-Reply-To=%3C20110203200153.B8D383FEF4%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="002540.html">
<LINK REL="Next" HREF="002542.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [409] Merge mdv commit 271837</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B409%5D%20Merge%20mdv%20commit%20271837&In-Reply-To=%3C20110203200153.B8D383FEF4%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [409] Merge mdv commit 271837">root at mageia.org
</A><BR>
<I>Thu Feb 3 21:01:53 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002540.html">[Mageia-sysadm] [408] Merge mdv commit 271835
</A></li>
<LI>Next message: <A HREF="002542.html">[Mageia-sysadm] [410] Merge mdv commit 271838
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2541">[ date ]</a>
<a href="thread.html#2541">[ thread ]</a>
<a href="subject.html#2541">[ subject ]</a>
<a href="author.html#2541">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>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>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002540.html">[Mageia-sysadm] [408] Merge mdv commit 271835
</A></li>
<LI>Next message: <A HREF="002542.html">[Mageia-sysadm] [410] Merge mdv commit 271838
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2541">[ date ]</a>
<a href="thread.html#2541">[ thread ]</a>
<a href="subject.html#2541">[ subject ]</a>
<a href="author.html#2541">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|