Author: jsrain Date: Wed Aug 12 09:38:48 2009 New Revision: 58326 URL: http://svn.opensuse.org/viewcvs/yast?rev=58326&view=rev Log: replace /etc/YaST2/control.xml before starting live installation with separate control file if exists remove package with separate control file after installation remove /usr/bin/correct_live_install after installation Modified: branches/SuSE-Code-11-Branch/live-installer/VERSION branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Code-11-Branch/live-installer/src/inst_live_cleanup.ycp branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp Modified: branches/SuSE-Code-11-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/VERSION?rev=58326&r1=58325&r2=58326&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/VERSION (original) +++ branches/SuSE-Code-11-Branch/live-installer/VERSION Wed Aug 12 09:38:48 2009 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes?rev=58326&r1=58325&r2=58326&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Code-11-Branch/live-installer/package/yast2-live-installer.changes Wed Aug 12 09:38:48 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Aug 11 13:01:49 CEST 2009 - jsrain@suse.cz + +- replace /etc/YaST2/control.xml before starting live installation + with separate control file if exists +- remove package with separate control file after installation +- remove /usr/bin/correct_live_install after installation +- 2.17.4 + +------------------------------------------------------------------- Fri Aug 7 11:30:31 CEST 2009 - jsrain@suse.cz - use separate control file if present Modified: branches/SuSE-Code-11-Branch/live-installer/src/inst_live_cleanup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/src/inst_live_cleanup.ycp?rev=58326&r1=58325&r2=58326&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/src/inst_live_cleanup.ycp (original) +++ branches/SuSE-Code-11-Branch/live-installer/src/inst_live_cleanup.ycp Wed Aug 12 09:38:48 2009 @@ -23,6 +23,10 @@ scriptname, SCR::Execute (.target.bash_output, scriptname) ); + y2milestone ("Removing %1 returned %2", + scriptname, + SCR::Execute (.target.bash_output, sformat ("/bin/rm %1", scriptname)) + ); } else { y2milestone ("Script %1 doesn't exist, skipping...", scriptname); } @@ -35,6 +39,15 @@ if (out["exit"]:0 != 0) y2error ("Removing yast2-live-installer failed: %1", out); +out = (map)SCR::Execute (.target.bash_output, "rpm -qa |grep '^control-live-'"); +if (out["exit"]:0 == 0) +{ + y2milestone ("Removing live control file"); + out = (map)SCR::Execute (.target.bash_output, "rpm -e `rpm -qa |grep '^control-live-'`"); + if (out["exit"]:0 != 0) + y2error ("Removing live control file failed: %1", out); +} + return `auto; } Modified: branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp?rev=58326&r1=58325&r2=58326&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Code-11-Branch/live-installer/src/live-installer.ycp Wed Aug 12 09:38:48 2009 @@ -32,6 +32,17 @@ Wizard::OpenNextBackStepsDialog(); + if ($[] != (map)SCR::Read (.target.stat, live_control_file)) { + ProductControl::custom_control_file = live_control_file; + // replace general control file because of 2nd stage + integer cpres = (integer)SCR::Execute (.target.bash, sformat ("/bin/cp %1 %2", live_control_file, "/etc/YaST2/control.xml")); + if (cpres != 0) + { + Report::Error (_("Failed to update the control file for the second stage of the installation")); + return nil; + } + } + // check available memory list memories = (list) SCR::Read(.probe.memory); integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; @@ -110,7 +121,6 @@ Stage::Set ("initial"); Storage::InitLibstorage (false); - ProductControl::custom_control_file = live_control_file; if (!ProductControl::Init()) y2error("control file %1 not found", ProductControl::custom_control_file ); ProductControl::AddWizardSteps(stage_mode); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org