Author: locilka Date: Tue Feb 24 14:50:08 2009 New Revision: 55721 URL: http://svn.opensuse.org/viewcvs/yast?rev=55721&view=rev Log: - Added support for `reboot_same_step (bnc #475650). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_worker_continue.ycp trunk/installation/src/include/inst_inc_second.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=55721&r1=55720&r2=55721&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 24 14:50:08 2009 @@ -2,6 +2,7 @@ Tue Feb 24 13:30:15 CET 2009 - locilka@suse.cz - Added support for .xz images deployment (bnc #476079). +- Added support for `reboot_same_step (bnc #475650). - 2.18.9 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/inst_worker_continue.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_worker_continue.ycp?rev=55721&r1=55720&r2=55721&view=diff ============================================================================== --- trunk/installation/src/clients/inst_worker_continue.ycp (original) +++ trunk/installation/src/clients/inst_worker_continue.ycp Tue Feb 24 14:50:08 2009 @@ -120,7 +120,7 @@ y2milestone("Evaluating ret: %1", ret); - if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step) { + if (ret == `reboot || ret == `restart_yast || ret == `restart_same_step || ret == `rebot_same_step) { ret = PrepareYaSTforRestart (ret); // Installation has been aborted } else if (ret == `abort) { @@ -134,7 +134,7 @@ StoreNetworkServices (ret); // when the installation is not aborted or YaST is not restarted on purpose - // ret == `next -> (ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) + // ret == `next -> (ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort && ret != `rebot_same_step) if (ret == `next) { HandleSecondStageFinishedCorrectly(); // installation (second stage) has been aborted 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=55721&r1=55720&r2=55721&view=diff ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Tue Feb 24 14:50:08 2009 @@ -370,6 +370,11 @@ ret = `restart_yast; } + if (ret == `reboot_same_step) { + last_step = last_step - 1; + ret = `reboot; + } + integer next_step = last_step + 1; y2milestone ("Creating %1 file with values %2", Installation::restart_data_file, [next_step, restarting_step]); Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=55721&r1=55720&r2=55721&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Tue Feb 24 14:50:08 2009 @@ -22,8 +22,8 @@ # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 -# ag_freespace -Requires: yast2 >= 2.18.4 +# `reboot_same_step +Requires: yast2 >= 2.18.11 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org