Author: locilka Date: Wed Mar 19 13:54:03 2008 New Revision: 45603 URL: http://svn.opensuse.org/viewcvs/yast?rev=45603&view=rev Log: - When checking whether to run the second stage, considering also autoinstallation, not only installation. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45603&r1=45602&r2=45603&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Mar 19 13:54:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 19 13:53:05 CET 2008 - locilka@suse.cz + +- When checking whether to run the second stage, considering also + autoinstallation, not only installation. + +------------------------------------------------------------------- Tue Mar 18 18:19:00 CET 2008 - locilka@suse.cz - Fixed writing disabled modules and proposals during the 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=45603&r1=45602&r2=45603&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Wed Mar 19 13:54:03 2008 @@ -91,10 +91,25 @@ } void HandleSecondStageRequired () { - if (Mode::installation() && Stage::initial()) { + if (Stage::initial()) { + // the current one is 'initial' + string stage_to_check = "continue"; + + // matching the control file + string mode_to_check = "unknown"; + + if (Mode::installation()) { + mode_to_check = "installation"; + } else if (Mode::autoinst()) { + mode_to_check = "autoinstallation"; + } + + // file name string run_yast_at_boot = sformat ("%1/%2", Installation::destdir, Installation::run_yast_at_boot); - if (ProductControl::RunRequired ("continue", "installation")) { + y2milestone ("Checking RunRequired (%1, %2)", stage_to_check, mode_to_check); + + if (ProductControl::RunRequired (stage_to_check, mode_to_check)) { y2milestone ("Running the second stage is required"); WFM::Write (.local.string, run_yast_at_boot, ""); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org