summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-15 14:16:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-15 14:16:26 +0000
commit3ade0608724ad62878c8c89cf4f2f147ad032ea0 (patch)
tree409c7c65e8caa7934a2161c6293a965d34cd32d5 /perl-install
parente2dac7484ca3cf78075516d9f9db29ec7efd2394 (diff)
downloaddrakx-3ade0608724ad62878c8c89cf4f2f147ad032ea0.tar
drakx-3ade0608724ad62878c8c89cf4f2f147ad032ea0.tar.gz
drakx-3ade0608724ad62878c8c89cf4f2f147ad032ea0.tar.bz2
drakx-3ade0608724ad62878c8c89cf4f2f147ad032ea0.tar.xz
drakx-3ade0608724ad62878c8c89cf4f2f147ad032ea0.zip
(write_lilo_conf): ensure linear and lba32 are not both set
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 08d67c482..49d8ee5fc 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -621,6 +621,8 @@ sub write_lilo_conf {
my ($prefix, $lilo, $fstab, $hds) = @_;
$lilo->{prompt} = $lilo->{timeout};
+ delete $lilo->{linear} if $lilo->{lba32};
+
my $file2fullname = sub {
my ($file) = @_;
if (arch() =~ /ia64/) {
@@ -968,6 +970,10 @@ IconIndex=0
sub install {
my ($prefix, $lilo, $fstab, $hds) = @_;
+ if (my ($p) = grep { $lilo->{boot} =~ /\Q$_->{device}/ } @$fstab) {
+ die _("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p))
+ if isFat($p) || isThisFs('xfs', $p);
+ }
{
my $f = "$prefix/etc/sysconfig/system";
setVarsInSh($f, add2hash_({ CLEAN_TMP => $lilo->{CLEAN_TMP} }, { getVarsFromSh($f) }));