Author: mzugec Date: Tue Apr 13 13:11:32 2010 New Revision: 61685 URL: http://svn.opensuse.org/viewcvs/yast?rev=61685&view=rev Log: - allow vlan on top of bonding device (bnc#591835) - allow vlan on top of bridge device (bnc#587129) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=61685&r1=61684&r2=61685&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Tue Apr 13 13:11:32 2010 @@ -1 +1 @@ -2.17.133 +2.17.134 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=61685&r1=61684&r2=61685&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Tue Apr 13 13:11:32 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 13 13:09:49 CEST 2010 - mzugec@suse.cz + +- allow vlan on top of bonding device (bnc#591835) +- allow vlan on top of bridge device (bnc#587129) +- 2.17.134 + +------------------------------------------------------------------- Tue Apr 13 12:34:15 CEST 2010 - mzugec@suse.cz - proxy: "/" character validation (bnc#566350) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp?rev=61685&r1=61684&r2=61685&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp Tue Apr 13 13:11:32 2010 @@ -129,7 +129,7 @@ map configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { - if (contains(["vlan", "bond", "br"], NetworkInterfaces::GetType(devname))) continue; + if (contains(["vlan"], NetworkInterfaces::GetType(devname))) continue; items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); }); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org