[yast-commit] r52481 - in /trunk/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp src/modules/LanUdevAuto.ycp

Author: mzugec Date: Thu Oct 23 17:54:55 2008 New Revision: 52481 URL: http://svn.opensuse.org/viewcvs/yast?rev=52481&view=rev Log: clone udev rules in AY (bnc#434103) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanItems.ycp trunk/network/src/modules/LanUdevAuto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=52481&r1=52480&r2=52481&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Oct 23 17:54:55 2008 @@ -1 +1 @@ -2.17.43 +2.17.44 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=52481&r1=52480&r2=52481&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Oct 23 17:54:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 23 17:53:01 CEST 2008 - mzugec@suse.de + +- clone udev rules in AY (bnc#434103) +- 2.17.44 + +------------------------------------------------------------------- Tue Oct 21 16:33:54 CEST 2008 - mzugec@suse.de - fixed device description (bnc#437326) Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=52481&r1=52480&r2=52481&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Thu Oct 23 17:54:55 2008 @@ -203,20 +203,6 @@ } }); return value; -// column: 0 mens rule, 1 means NAME -/* - list<string> udevs=["", ""]; - if (size(Items[current, "udev", "net"]:[])>3) - { - foreach(string row, Items[current, "udev", "net"]:[], { - if (issubstring(row, "ATTR{address}")||issubstring(row, "KERNELS")) udevs[0]=row; - else if (issubstring(row, "NAME")) udevs[1]=regexpsub (row, ".*=[\"]*([^ ]*)\"$", "\\1"); - - }); - } -y2internal("udevs %1", udevs); - return udevs; -*/ } global list<string> GetReplacedItemUdev(string r_key, string r_val){ Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=52481&r1=52480&r2=52481&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Thu Oct 23 17:54:55 2008 @@ -199,7 +199,34 @@ ]; } }); + } else{ +/* + list<map> all_devices=[]; +y2internal("export devices %1", devices); + foreach(string key, (list<string>)Map::Keys(devices), { + all_devices=add(all_devices, devices[key]:$[]); + }); + y2internal("export rules %1", createUdevFromIfaceName(all_devices)); +*/ + foreach(integer id, map row, (map >)LanItems::Items, { + LanItems::current=id; + if (size(row["ifcfg"]:"")>0){ + string name = LanItems::GetItemUdev("NAME"); + string mac_rule = LanItems::GetItemUdev("ATTR{address}"); + string bus_rule = LanItems::GetItemUdev("KERNELS"); + if (size(mac_rule)==0 && size(bus_rule)==0){ + y2error("No MAC or BusID rule %1", row); + continue; + } + AY["net-udev", name]=$["rule" : size(mac_rule)>0 ? "ATTR{address}" : "KERNELS", + "name" : name, + "value" : size(mac_rule)>0 ? mac_rule : bus_rule + ]; + + } + }); } + y2internal("AY profile %1", AY); return AY; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org