Author: locilka Date: Mon Nov 3 18:43:26 2008 New Revision: 52858 URL: http://svn.opensuse.org/viewcvs/yast?rev=52858&view=rev Log: - Writing 'SecondStageRequired' 0/1 to /etc/install.inf even while rebooting during second stage (bnc #432005). - 2.17.26 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp trunk/installation/src/include/inst_inc_second.ycp trunk/installation/src/include/misc.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52858&r1=52857&r2=52858&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Nov 3 18:43:26 2008 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=52858&r1=52857&r2=52858&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 3 18:43:26 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 3 18:34:30 CET 2008 - locilka@suse.cz + +- Writing 'SecondStageRequired' 0/1 to /etc/install.inf even while + rebooting during second stage (bnc #432005). +- 2.17.26 + +------------------------------------------------------------------- Mon Nov 03 14:28:14 CET 2008 - aschnell@suse.de - better reboot message during ssh installation (bnc #439572 and 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=52858&r1=52857&r2=52858&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Mon Nov 3 18:43:26 2008 @@ -147,25 +147,6 @@ } } - /** - * Writes to /etc/install.inf whether running the second stage is required - * This is written to inst-sys and not copied to the installed system - * (which is already umounted in that time). - * - * @see BNC #439572 - */ - void WriteSecondStageRequired (boolean scst_required) { - // writes 'SecondStageRequired' '1' or '0' - // if such tag exists, it is removed before - WFM::Execute (.local.bash, sformat ( - "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", - "SecondStageRequired", - (scst_required == false ? "0":"1"), - "/etc/install.inf" - )); - Linuxrc::ResetInstallInf(); - } - void HandleSecondStageRequired () { if (Stage::initial()) { // the current one is 'initial' Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_inc_second.ycp?rev=52858&r1=52857&r2=52858&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Mon Nov 3 18:43:26 2008 @@ -352,6 +352,10 @@ } symbol PrepareYaSTforRestart (symbol ret) { + // bnc #432005 + // After reboot, YaST will be started (inform user what to do if needed) + boolean yast_needs_rebooting = false; + // restarting yast, removing files that identify the user-abort or installation-crash // bugzilla #222896 if (FileUtils::Exists (Installation::file_inst_aborted)) SCR::Execute (.target.remove, Installation::file_inst_aborted); @@ -376,6 +380,9 @@ y2milestone ("Creating %1 file", Installation::reboot_file); SCR::Execute (.target.bash, sformat ( "touch %1", Installation::reboot_file)); + // bnc #432005 + y2milestone ("YaST needs rebooting"); + yast_needs_rebooting = true; } else if (ret == `restart_yast) { y2milestone ("Creating %1 file", Installation::restart_file); @@ -383,6 +390,8 @@ "touch %1", Installation::restart_file)); } + WriteSecondStageRequired (yast_needs_rebooting); + return ret; } Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.ycp?rev=52858&r1=52857&r2=52858&view=diff ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Mon Nov 3 18:43:26 2008 @@ -286,4 +286,23 @@ } } + /** + * Writes to /etc/install.inf whether running the second stage is required + * This is written to inst-sys and not copied to the installed system + * (which is already umounted in that time). + * + * @see BNC #439572 + */ + void WriteSecondStageRequired (boolean scst_required) { + // writes 'SecondStageRequired' '1' or '0' + // if such tag exists, it is removed before + WFM::Execute (.local.bash, sformat ( + "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", + "SecondStageRequired", + (scst_required == false ? "0":"1"), + "/etc/install.inf" + )); + Linuxrc::ResetInstallInf(); + } + } //end of include -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org