Mailinglist Archive: yast-commit (213 mails)

< Previous Next >
[yast-commit] r62017 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/lan/bridge.ycp
  • From: mzugec@xxxxxxxxxxxxxxxx
  • Date: Mon, 17 May 2010 10:18:48 -0000
  • Message-id: <E1ODxPM-0003mc-F0@xxxxxxxxxxxxxxxx>
Author: mzugec
Date: Mon May 17 12:18:47 2010
New Revision: 62017

URL: http://svn.opensuse.org/viewcvs/yast?rev=62017&view=rev
Log:
additional addresses for bridge (bnc#590160)

Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/address.ycp
trunk/network/src/lan/bridge.ycp

Modified: trunk/network/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62017&r1=62016&r2=62017&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Mon May 17 12:18:47 2010
@@ -1 +1 @@
-2.19.27
+2.19.28

Modified: trunk/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62017&r1=62016&r2=62017&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Mon May 17 12:18:47 2010
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon May 17 12:17:30 CEST 2010 - mzugec@xxxxxxx
+
+- additional addresses for bridge (bnc#590160)
+- 2.19.28
+
+-------------------------------------------------------------------
Fri May 14 10:54:52 CEST 2010 - mzugec@xxxxxxx

- improved help text (bnc#580039)

Modified: trunk/network/src/lan/address.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=62017&r1=62016&r2=62017&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Mon May 17 12:18:47 2010
@@ -641,17 +641,6 @@
"store": StoreVLANSlave,
"help": help["etherdevice"]:"",
],
-/*
- "BONDSLAVES": $[
- "widget": `multi_selection_box,
- "label": _("Bond &Slaves"),
- "opt": [`shrinkable],
- "items" : [ ],
- "init": InitSlave,
- "store": StoreSlave,
- "help": help["bondslave"]:"",
- ],
-*/
"BONDSLAVE": $[
"widget": `multi_selection_box,
"label": _("Bond &Slaves"),
@@ -943,6 +932,7 @@
"AD_ADDRESSES",
frame2
);
+/*
if (LanItems::type == "br")
{
address_contents = `VBox(
@@ -952,7 +942,9 @@
frame2
);
}
- else if (contains(["tun", "tap"], LanItems::type))
+ else
+*/
+ if (contains(["tun", "tap"], LanItems::type))
{
address_contents = `VBox(
`Left(label),
@@ -1016,6 +1008,10 @@
"header" : _("&Bond Slaves"),
"contents" : `VBox( "BONDSLAVE", "BONDOPTION" )
],
+ "bridge_ports" : $[
+ "header" : _("Bridged Devices"),
+ "contents" : `VBox( "BRIDGE_PORTS" )
+ ],
"t3" : $[
"header" : _("&Wireless"),
"contents" : `Empty (),
@@ -1027,8 +1023,9 @@
"tab_help" : "",
"fallback_functions" : functions,
];
- if (contains(["vlan", "br"], LanItems::type)) wd_content["tab_order"]=
["t_general", "t_addr"];
+ if (LanItems::type=="vlan") wd_content["tab_order"]= ["t_general",
"t_addr"];
if (contains(["tun", "tap"], LanItems::type)) wd_content["tab_order"]=
["t_addr"];
+ if (LanItems::type=="br") wd_content["tab_order"]= ["t_general", "t_addr",
"bridge_ports"];
if (LanItems::type == "bond")
wd_content["tab_order"]=add(wd_content["tab_order"]:[], "bond_slaves");

hw_standalone=false;

Modified: trunk/network/src/lan/bridge.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=62017&r1=62016&r2=62017&view=diff
==============================================================================
--- trunk/network/src/lan/bridge.ycp (original)
+++ trunk/network/src/lan/bridge.ycp Mon May 17 12:18:47 2010
@@ -23,7 +23,6 @@
// from all configured netcards filter 0.0.0.0 configurations
map <string, any> configurations =
NetworkInterfaces::FilterDevices("netcard");
foreach(string devtype,
splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), {
-// if (contains(["br", "vlan"], devtype)) continue;
if (contains(["br"], devtype)) continue;
if (contains(["tun", "tap"], devtype)) {
foreach(string devname, (list<string>)
Map::Keys(configurations[devtype]:$[]), {

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages