Author: mvidner Date: Tue Jan 24 16:44:43 2012 New Revision: 67262 URL: http://svn.opensuse.org/viewcvs/yast?rev=67262&view=rev Log: - Fixed broken autoyast in general (bnc#742855) and in case with keep_install_network without dns without routing (bnc#712864). - Filter out more Chelsio devices, by PCI id (bnc#711432#c83) merged from SLE11-SP2 Modified: trunk/network/ (props changed) trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67262&r1=6726... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jan 24 16:44:43 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jan 24 16:44:43 2012 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jan 24 16:28:37 CET 2012 - mvidner@suse.cz + +- Fixed broken autoyast in general (bnc#742855) + and in case with keep_install_network without dns without routing + (bnc#712864). +- Filter out more Chelsio devices, by PCI id (bnc#711432#c83) +- 2.22.2 + +------------------------------------------------------------------- Thu Jan 12 15:52:47 CET 2012 - mvidner@suse.cz - AY keep_install_network: merge dns and routing from linuxrc Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?... ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Tue Jan 24 16:44:43 2012 @@ -297,18 +297,24 @@ Lan::Read(`cache); // export settings into AY map map from_system=Lan::Export(); - map dns = from_system["dns"]:$[]; - map routing = from_system["routing"]:$[]; + map<string, any> dns = from_system["dns"]:$[]; + map<string, any> routing = from_system["routing"]:$[]; // copy the keys/values that are not existing in the XML // so we merge the inst-sys settings with the XML while XML // has higher priority + if (! haskey(param, "dns")) { + param["dns"] = $[]; + } foreach( string key, any value, dns, { if( ! haskey( param["dns"]:$[], key ) ) { y2milestone("(dns) taking %1 from inst-sys. Value = %2", key, value); param["dns",key] = value; } }); + if (! haskey(param, "routing")) { + param["routing"] = $[]; + } foreach( string key, any value, routing, { if( ! haskey( param["routing"]:$[], key ) ) { param["routing",key] = value; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp... ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Tue Jan 24 16:44:43 2012 @@ -750,8 +750,9 @@ card_ok=false; y2milestone("Filtering out virtio device without device file."); } - // filter out device with chelsio Driver and no Device File (bnc#711432) - if (one["module"]:""=="cxgb4" && one["dev_name"]:""==""){ + // filter out device with chelsio Driver and no Device File or which cannot networking(bnc#711432) + if ((one["module"]:""=="cxgb4" && one["dev_name"]:""=="") || + (card["vendor_id"]:0==0x11425 && card["device_id"]:0 == 0x14102)){ // 0x10000 for PCI and 0x4102 is device id of device and 0x1425 for chelsio inc card_ok=false; y2milestone("Filtering out Chelsio device without device file."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org