[yast-commit] r60387 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp

Author: mzugec Date: Fri Jan 15 10:03:29 2010 New Revision: 60387 URL: http://svn.opensuse.org/viewcvs/yast?rev=60387&view=rev Log: allow bridge as ETHERDEVICE for VLAN (bnc#569970) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60387&r1=60386&r2=60387&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jan 15 10:03:29 2010 @@ -1 +1 @@ -2.19.6 +2.19.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=60387&r1=60386&r2=60387&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jan 15 10:03:29 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 10:02:26 CET 2010 - mzugec@suse.cz + +- allow bridge as ETHERDEVICE for VLAN (bnc#569970) +- 2.19.7 + +------------------------------------------------------------------- Thu Jan 14 17:59:48 CET 2010 - mzugec@suse.cz - support for BOOTPROTO=ibft option (bnc#551380) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=60387&r1=60386&r2=60387&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Jan 15 10:03:29 2010 @@ -128,7 +128,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", "bond"], 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