Author: mzugec Date: Mon May 4 15:09:03 2009 New Revision: 57053 URL: http://svn.opensuse.org/viewcvs/yast?rev=57053&view=rev Log: fixed: after autoinstall, dns and routing info are lost (bnc#498993) 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=57053&r1=57052&r2=57053&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 4 15:09:03 2009 @@ -1 +1 @@ -2.18.30 +2.18.31 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=57053&r1=57052&r2=57053&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 4 15:09:03 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 4 14:48:06 CEST 2009 - mzugec@suse.de + +- fixed: after autoinstall, dns and routing info are lost + (bnc#498993) +- 2.18.31 + +------------------------------------------------------------------- Tue Apr 28 16:02:37 CEST 2009 - mzugec@suse.de - correctly read/write module options (bnc#487656) Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=57053&r1=57052&r2=57053&view=diff ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Mon May 4 15:09:03 2009 @@ -284,6 +284,29 @@ ret = LanAutoSequence(""); } else if(func == "Import") { + // see bnc#498993 + // in case keep_install_network is set to true (in AY) + // and there is no dns and routing definition, + // we'll keep values from installation + if(param["keep_install_network"]:false==true) { + y2milestone("keep_install_network is enabled"); + if(param["dns"]:$[]==$[] && param["routing"]:$[]==$[]){ + y2milestone("DNS and routing are not defined in AY, will keep settings from installation"); + // read settings from installation + Lan::Read(`cache); + // export settings into AY map + map from_system=Lan::Export(); + map dns=from_system["dns"]:$[]; + map routing=from_system["routing"]:$[]; + // merge with param + param["dns"]=dns; + param["routing"]=routing; + y2milestone("", dns); + y2milestone("", routing); + } else{ + y2milestone("DNS and routing defined in AY profile, will use it"); + } + } map new = FromAY(param); Lan::Import(new); ret = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org