|
Lines 452-457
Link Here
|
| 452 |
|
452 |
|
| 453 |
if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step)) |
453 |
if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step)) |
| 454 |
{ |
454 |
{ |
|
|
455 |
// restarting yast, removing files that identify the user-abort or installation-crash |
| 456 |
// bugzilla #222896 |
| 457 |
if (FileUtils::Exists (file_inst_aborted)) SCR::Execute (.target.remove, file_inst_aborted); |
| 458 |
if (FileUtils::Exists (file_inst_failed)) SCR::Execute (.target.remove, file_inst_failed); |
| 459 |
|
| 460 |
// creating new files to identify restart |
| 455 |
integer last_step = ProductControl::CurrentStep (); |
461 |
integer last_step = ProductControl::CurrentStep (); |
| 456 |
integer restarting_step = last_step; |
462 |
integer restarting_step = last_step; |
| 457 |
if (ret == `restart_same_step) |
463 |
if (ret == `restart_same_step) |
|
Lines 485-492
Link Here
|
| 485 |
if (!Mode::test ()) |
491 |
if (!Mode::test ()) |
| 486 |
WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe"); |
492 |
WFM::Execute (.local.bash, "/bin/echo \"/sbin/modprobe\" >/proc/sys/kernel/modprobe"); |
| 487 |
|
493 |
|
| 488 |
// when the installation is not aborted |
494 |
// when the installation is not aborted or YaST is not restarted on purpose |
| 489 |
if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `abort) |
495 |
if (Stage::cont () && ret != `reboot && ret != `restart_yast && ret != `restart_same_step && ret != `abort) |
| 490 |
{ |
496 |
{ |
| 491 |
// remove /etc/install.inf, not needed any more |
497 |
// remove /etc/install.inf, not needed any more |
| 492 |
SCR::Execute (.target.remove, "/etc/install.inf"); |
498 |
SCR::Execute (.target.remove, "/etc/install.inf"); |