[yast-commit] r42006 - in /trunk/installation: package/yast2-installation.changes src/clients/copy_files_finish.ycp
Author: locilka Date: Tue Nov 13 13:57:02 2007 New Revision: 42006 URL: http://svn.opensuse.org/viewcvs/yast?rev=42006&view=rev Log: - Script copy_files_finish.ycp cleaned up. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/copy_files_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=42006&r1=42005&r2=42006&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Nov 13 13:57:02 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 13 13:54:13 CET 2007 - locilka@suse.cz + +- Script copy_files_finish.ycp cleaned up. + +------------------------------------------------------------------- Fri Nov 9 13:30:34 CET 2007 - locilka@suse.cz - Boot Installed System option has been removed (#327505). Modified: trunk/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/copy_files_finish.ycp?rev=42006&r1=42005&r2=42006&view=diff ============================================================================== --- trunk/installation/src/clients/copy_files_finish.ycp (original) +++ trunk/installation/src/clients/copy_files_finish.ycp Tue Nov 13 13:57:02 2007 @@ -60,14 +60,23 @@ AdjustModprobeBlacklist(); // copy hardware status to installed system - SCR::Execute (.target.bash,"/bin/cp -a '/var/lib/hardware' " + - "'" + String::Quote (Installation::destdir) + "/var/lib'"); + y2milestone ("Copying hardware information"); + WFM::Execute (.local.bash, + sformat ( + "mkdir -p '%1/var/lib/'; /bin/cp -a '/var/lib/hardware' '%1/var/lib/'", + String::Quote (Installation::destdir) + ) + ); // if VNC, copy setup data - if (Linuxrc::vnc ()) - { - WFM::Execute (.local.bash, "/bin/cp -a '/root/.vnc' " + - "'" + String::Quote (Installation::destdir) + "/root'"); + if (Linuxrc::vnc ()) { + y2milestone ("Copying VNC settings"); + WFM::Execute (.local.bash, + sformat ( + "/bin/cp -a '/root/.vnc' '%1/root/'", + String::Quote (Installation::destdir) + ) + ); } @@ -77,15 +86,19 @@ Linuxrc::SaveInstallInf (Installation::destdir); // Copy control.xml so it can be read once again during continue mode - SCR::Execute (.target.bash, "/bin/cp " + ProductControl::current_control_file + " " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); - SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); - // Copy also control files of add-on products - string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files"; + y2milestone ("Copying YaST control file"); + WFM::Execute (.local.bash, + sformat ( + "/bin/cp '%1' '%2%3/control.xml' && /bin/chmod 0644 '%2%3/control.xml'", + String::Quote (ProductControl::current_control_file), + String::Quote (Installation::destdir), + String::Quote (Directory::etcdir) + ) + ); // List of files used as additional workflow definitions if (size (WorkflowManager::GetAllUsedControlFiles()) > 0) { + y2milestone ("Coping additional control files %1", WorkflowManager::GetAllUsedControlFiles()); list <string> workflows_list = []; foreach (string one_filename, WorkflowManager::GetAllUsedControlFiles(), { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
locilka@svn.opensuse.org