Author: mvidner Date: Tue Jan 24 16:28:57 2012 New Revision: 67261 URL: http://svn.opensuse.org/viewcvs/yast?rev=67261&view=rev Log: Fixed broken autoyast in general (bnc#742855) and in case with keep_install_network without dns without routing (bnc#712864). Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/VERSION?rev=67261&r1=67260&r2=67261&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Tue Jan 24 16:28:57 2012 @@ -1 +1 @@ -2.17.167 +2.17.168 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes?rev=67261&r1=67260&r2=67261&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Tue Jan 24 16:28:57 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +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). +- 2.17.168 + +------------------------------------------------------------------- Mon Jan 23 14:15:33 CET 2012 - mvidner@suse.cz - Filter out more Chelsio devices, by PCI id (bnc#711432#c83) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp?rev=67261&r1=67260&r2=67261&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Tue Jan 24 16:28:57 2012 @@ -295,18 +295,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 dns = from_system["dns"]:$[]; + map 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; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org