summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-12 14:31:42 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-12 14:31:42 +0000
commitfb5b2037cca9b1f92edbf72faf2d13395ad37cb4 (patch)
tree6c782e170bdb04d421a12d56882f8cf818e721fa /perl-install/install_steps.pm
parent6c41a169c4c78f98807e0a55cde0cb9ea17fd247 (diff)
downloaddrakx-fb5b2037cca9b1f92edbf72faf2d13395ad37cb4.tar
drakx-fb5b2037cca9b1f92edbf72faf2d13395ad37cb4.tar.gz
drakx-fb5b2037cca9b1f92edbf72faf2d13395ad37cb4.tar.bz2
drakx-fb5b2037cca9b1f92edbf72faf2d13395ad37cb4.tar.xz
drakx-fb5b2037cca9b1f92edbf72faf2d13395ad37cb4.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a4bf25532..16835a196 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -49,9 +49,9 @@ sub leavingStep($$) {
eval { commands::cp('-f', "/tmp/ddebug.log", "$o->{prefix}/root") } if -d "$o->{prefix}/root" && !$::testing;
for (my $s = $o->{steps}{first}; $s; $s = $o->{steps}{$s}{next}) {
-
+ #- the reachability property must be recomputed each time to take
+ #- into account failed step.
next if $o->{steps}{$s}{done} && !$o->{steps}{$s}{redoable};
- next if $o->{steps}{$s}{reachable};
my $reachable = 1;
if (my $needs = $o->{steps}{$s}{needs}) {
@@ -340,9 +340,11 @@ sub readBootloaderConfigBeforeInstall {
$v = readlink "$o->{prefix}/boot/$image";
if ($v) {
$v = "/boot/$v" if $v !~ m@/@;
- $o->{bootloader}{entries}{$v} = $o->{bootloader}{entries}{"/boot/$image"};
- delete $o->{bootloader}{entries}{"/boot/$image"};
- log::l("renaming /boot/$image entry by $v");
+ if (-e "$o->{prefix}$v") {
+ $o->{bootloader}{entries}{$v} = $o->{bootloader}{entries}{"/boot/$image"};
+ delete $o->{bootloader}{entries}{"/boot/$image"};
+ log::l("renaming /boot/$image entry by $v");
+ }
}
}
}