Attachment 106370 Details for Bug 222896

[patch] Proposed patch

inst.diff (text/plain), 1.33 KB, created by Lukas Ocilka on 2006-11-21 10:37:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Ocilka

Created: 2006-11-21 10:37:20 UTC

Size: 1.33 KB

patch

obsolete

>Index: installation_worker.ycp
>===================================================================
>--- installation_worker.ycp	(revision 34522)
>+++ installation_worker.ycp	(working copy)
>@@ -452,6 +452,12 @@
> 
>     if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
>     {
>+	// restarting yast, removing files that identify the user-abort or installation-crash
>+	// bugzilla #222896
>+	if (FileUtils::Exists (file_inst_aborted)) SCR::Execute (.target.remove, file_inst_aborted);
>+	if (FileUtils::Exists (file_inst_failed))  SCR::Execute (.target.remove, file_inst_failed);
>+
>+	// creating new files to identify restart
> 	integer last_step = ProductControl::CurrentStep ();
> 	integer restarting_step = last_step;
> 	if (ret == `restart_same_step)
>@@ -485,8 +491,8 @@
>     if (!Mode::test ())
>         WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe");
> 
>-    // when the installation is not aborted
>-    if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `abort)
>+    // when the installation is not aborted or YaST is not restarted on purpose
>+    if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort)
>     {
> 	// remove /etc/install.inf, not needed any more
> 	SCR::Execute (.target.remove, "/etc/install.inf");

Actions: View | Diff

Attachments on bug 222896: 106362 | 106370