summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-06-23 13:03:19 +0000
committerFrancois Pons <fpons@mandriva.com>2000-06-23 13:03:19 +0000
commitc8d8767aa3dfeb049fd662080ac8cf2a7075ca56 (patch)
treee424b6ad6a2f2142554bee44cedd04d5016de938 /perl-install/install_steps.pm
parentb8820f0b8f1a137b9baa11b76626ad79e47cb707 (diff)
downloaddrakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.gz
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.bz2
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.tar.xz
drakx-c8d8767aa3dfeb049fd662080ac8cf2a7075ca56.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 319a4c54a..0733ad852 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -202,7 +202,7 @@ sub choosePartitionsToFormat($$) {
fsedit::typeOfPart($_->{device});
$_->{toFormatUnsure} = $_->{mntpoint} eq "/" ||
#- if detected dos/win, it's not precise enough to just compare the types (too many of them)
- (isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type});
+ (!$t || isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type});
}
}
}
@@ -852,6 +852,7 @@ sub setupBootloader($) {
# map_index { "$::i:$b->{part_nb}$_ root=$b->{root} $b->{perImageAppend}\n" }
# map { /$o->{prefix}(.*)/ } eval { glob_("$o->{prefix}/boot/vmlinux*") };
} elsif (arch() =~ /^sparc/) {
+ silo::set_promvars($o->{fstab}, $o->{bootloader});
silo::install($o->{prefix}, $o->{bootloader});
} else {
lilo::install($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds});