summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-22 23:18:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-22 23:18:25 +0000
commit9ee84a2c340af2d4b1912d7573c2223368a22903 (patch)
tree3d59260e22c2e03770f9a24370b11e9e350b18f5 /perl-install/install_steps.pm
parent5c1d5c819d907a1bb5e98477b9aeb7dc9e2fda9e (diff)
downloaddrakx-backup-do-not-use-9ee84a2c340af2d4b1912d7573c2223368a22903.tar
drakx-backup-do-not-use-9ee84a2c340af2d4b1912d7573c2223368a22903.tar.gz
drakx-backup-do-not-use-9ee84a2c340af2d4b1912d7573c2223368a22903.tar.bz2
drakx-backup-do-not-use-9ee84a2c340af2d4b1912d7573c2223368a22903.tar.xz
drakx-backup-do-not-use-9ee84a2c340af2d4b1912d7573c2223368a22903.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm11
1 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5abd53cff..7d3b00e03 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -17,6 +17,7 @@ use raid;
use keyboard;
use log;
use fsedit;
+use loopback;
use commands;
use network;
use any;
@@ -157,7 +158,9 @@ sub choosePartitionsToFormat($$) {
$_->{mntpoint} or next;
unless ($_->{toFormat} = $_->{notFormatted} || $o->{partitioning}{autoformat}) {
- my $t = fsedit::typeOfPart($_->{device});
+ my $t = isLoopback($_) ?
+ eval { fsedit::typeOfPart($o->{prefix} . loopback::file($_)) } :
+ fsedit::typeOfPart($_->{device});
$_->{toFormatUnsure} = $_->{mntpoint} eq "/" ||
#- if detected dos/win, it's not precise enough to just compare the types (too many of them)
(isFat({ type => $t }) ? !isFat($_) : $t != $_->{type});
@@ -655,8 +658,10 @@ sub setupBootloader($) {
} elsif (arch() =~ /^sparc/) {
silo::install($o->{prefix}, $o->{bootloader});
} else {
- lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab});
- lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab});
+ eval { lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}) };
+ my $err = $@;
+ eval { lilo::install_grub($o->{prefix}, $o->{bootloader}, $o->{fstab}) };
+ die if $err;
}
}