diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html new file mode 100644 index 000000000..a754fdc9b --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110203/5ab888ba/attachment.html @@ -0,0 +1,106 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[405] Merge mdv commit 271832</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>405</dd> +<dt>Author</dt> <dd>dmorgan</dd> +<dt>Date</dt> <dd>2011-02-03 20:54:25 +0100 (Thu, 03 Feb 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>Merge mdv commit 271832</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#drakxnettrunklibnetworkconnectionpm">drakx-net/trunk/lib/network/connection.pm</a></li> +<li><a href="#drakxnettrunklibnetworknetworkpm">drakx-net/trunk/lib/network/network.pm</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="drakxnettrunklibnetworkconnectionpm">Modified: drakx-net/trunk/lib/network/connection.pm</a> +=================================================================== +--- 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}, + +<a id="drakxnettrunklibnetworknetworkpm">Modified: drakx-net/trunk/lib/network/network.pm</a> +=================================================================== +--- 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)) + +</pre></div> + +</body> +</html>
\ No newline at end of file |