Author: mzugec Date: Wed Apr 2 16:25:15 2008 New Revision: 45974 URL: http://svn.opensuse.org/viewcvs/yast?rev=45974&view=rev Log: fixed autoyast profile <device> section (bnc#376321) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=45974&r1=45973&r2=45974&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Apr 2 16:25:15 2008 @@ -1 +1 @@ -2.16.30 +2.16.31 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=45974&r1=45973&r2=45974&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Apr 2 16:25:15 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 1 21:49:06 CEST 2008 - mzugec@suse.de + +- fixed autoyast profile <device> section (bnc#376321) +- 2.16.31 + +------------------------------------------------------------------- Tue Apr 1 17:09:58 CEST 2008 - mzugec@suse.de - improved text for devices without kernel device (bnc#375805) Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=45974&r1=45973&r2=45974&view=diff ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Wed Apr 2 16:25:15 2008 @@ -122,10 +122,10 @@ foreach(string devname, map if_data, interfaces, { - string type = NetworkInterfaces::device_type (devname); - string id = NetworkInterfaces::device_num (devname); + string type = NetworkInterfaces::GetType(devname); +// string id = NetworkInterfaces::device_num (devname); map d = devices[type]:$[]; - d[id] = if_data; + d[devname] = if_data; devices[type] = d; }); @@ -183,8 +183,8 @@ define map ToAY (map settings) { list interfaces = []; list discard = ["UDI", "_nm_name"]; - foreach(string device, map devsmap, settings["devices"]:$[], { - foreach(string num, map devmap, (map) devsmap, { + foreach(string type, map devsmap, settings["devices"]:$[], { + foreach(string device, map devmap, (map) devsmap, { map newmap = $[]; foreach(string key, any val, (map) devmap, { y2milestone("Adding: %1=%2", key, val); @@ -208,10 +208,10 @@ } }); - if (deletechars(num, "0123456789") == "") - newmap["device"] = device + num; + if (deletechars(device, "0123456789") == "") + newmap["device"] = device; else - newmap["device"] = device + "-" + num; + newmap["device"] = device; interfaces = add(interfaces, newmap); }); }); @@ -273,6 +273,7 @@ } else if(func == "Import") { map new = FromAY(param); +y2internal("AY new %1", new); Lan::Import(new); ret = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org