From 3ade0608724ad62878c8c89cf4f2f147ad032ea0 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 15 Sep 2001 14:16:26 +0000
Subject: (write_lilo_conf): ensure linear and lba32 are not both set

---
 perl-install/bootloader.pm | 6 ++++++
 1 file changed, 6 insertions(+)

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) }));
-- 
cgit v1.2.1