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
113
114
115
116
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [405] Merge mdv commit 271832
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B405%5D%20Merge%20mdv%20commit%20271832&In-Reply-To=%3C20110203195425.61E083FEF2%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="002536.html">
<LINK REL="Next" HREF="002538.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [405] Merge mdv commit 271832</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B405%5D%20Merge%20mdv%20commit%20271832&In-Reply-To=%3C20110203195425.61E083FEF2%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [405] Merge mdv commit 271832">root at mageia.org
</A><BR>
<I>Thu Feb 3 20:54:25 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002536.html">[Mageia-sysadm] [404] add script to move part of secret
</A></li>
<LI>Next message: <A HREF="002538.html">[Mageia-sysadm] [406] Merge mdv commit 271833
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2537">[ date ]</a>
<a href="thread.html#2537">[ thread ]</a>
<a href="subject.html#2537">[ subject ]</a>
<a href="author.html#2537">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>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>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002536.html">[Mageia-sysadm] [404] add script to move part of secret
</A></li>
<LI>Next message: <A HREF="002538.html">[Mageia-sysadm] [406] Merge mdv commit 271833
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2537">[ date ]</a>
<a href="thread.html#2537">[ thread ]</a>
<a href="subject.html#2537">[ subject ]</a>
<a href="author.html#2537">[ 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>
|
