Author: jsuchome Date: Thu Mar 24 16:16:27 2011 New Revision: 63660 URL: http://svn.opensuse.org/viewcvs/yast?rev=63660&view=rev Log: - do not start automatic configuration for autoYaST (bnc#679435) - 2.21.0 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63660&r1=63659&r2=63660&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Mar 24 16:16:27 2011 @@ -1 +1 @@ -2.20.6 +2.21.0 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=63660&r1=63659&r2=63660&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Mar 24 16:16:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 24 16:14:02 CET 2011 - jsuchome@suse.cz + +- do not start automatic configuration for autoYaST (bnc#679435) +- 2.21.0 + +------------------------------------------------------------------- Mon Feb 28 14:52:26 CET 2011 - locilka@suse.cz - Handling disabled installation steps also in Live Installation Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_first.ycp?rev=63660&r1=63659&r2=63660&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Thu Mar 24 16:16:27 2011 @@ -99,6 +99,13 @@ boolean enable_autoconfiguration = ProductFeatures::GetBooleanFeature ("globals", "enable_autoconfiguration"); boolean autoconfiguration_default = ProductFeatures::GetBooleanFeature ("globals", "autoconfiguration_default"); + // bnc#679435: leave normal second stage for autoYaST + if (Mode::autoinst ()) + { + enable_autoconfiguration = false; + autoconfiguration_default = false; + } + // Enabled only when AC is selected InstData::enable_autoconfiguration = (enable_autoconfiguration == true); // Default state -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org