Author: locilka Date: Mon Feb 2 13:13:44 2009 New Revision: 55181 URL: http://svn.opensuse.org/viewcvs/yast?rev=55181&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). - 2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/VERSION branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-Code-11-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/VERSION?rev=55181&r1=55180&r2=55181&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/installation/VERSION Mon Feb 2 13:13:44 2009 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes?rev=55181&r1=55180&r2=55181&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Mon Feb 2 13:13:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka@suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). +- 2.17.51 + +------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka@suse.cz - Disabling [Back] buttons in the very first interactive dialogs Modified: branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp?rev=55181&r1=55180&r2=55181&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Mon Feb 2 13:13:44 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org