Author: mzugec Date: Mon Jul 26 17:44:04 2010 New Revision: 62300 URL: http://svn.opensuse.org/viewcvs/yast?rev=62300&view=rev Log: L3: allow unconfigured devices for VLAN (bnc#625103) 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=62300&r1=62299&r2=62300&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Jul 26 17:44:04 2010 @@ -1 +1 @@ -2.19.33 +2.19.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62300&r1=62299&r2=62300&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Jul 26 17:44:04 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 26 17:43:09 CEST 2010 - mzugec@suse.cz + +- L3: allow unconfigured devices for VLAN (bnc#625103) +- 2.19.34 + +------------------------------------------------------------------- Wed Jun 23 09:41:31 CEST 2010 - mzugec@suse.cz - L3: AY Layer2 support (bnc#573607) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=62300&r1=62299&r2=62300&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Mon Jul 26 17:44:04 2010 @@ -126,6 +126,14 @@ settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; list items = []; + // unconfigured devices + foreach(integer i, map a, (map<integer, map>)LanItems::Items,{ + if (size(a["ifcfg"]:"")==0){ + string dev_name = a["hwinfo", "dev_name"]:""; + items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); + } + }); + // configured devices map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { @@ -136,6 +144,8 @@ UI::ChangeWidget(`id(key), `Items, items); } + + /** * Default function to store the value of ETHERDEVICE devices box. * @param key id of the widget -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org