From e5d2c05ffabb6c14fc6840e658f8c92155a052e7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 4 Aug 2001 12:42:25 +0000
Subject: as when lilo is selected, we don't try to install grub, just create
 the config file in case it may be useful

---
 perl-install/bootloader.pm | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a7a0e4b83..453b7c7c6 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -620,7 +620,7 @@ sub install_silo($$$) {
     c::setPromVars($silo->{bootalias}, $silo->{bootdev});
 }
 
-sub install_lilo ($$) {
+sub write_lilo_conf {
     my ($prefix, $lilo, $fstab, $hds) = @_;
     $lilo->{prompt} = $lilo->{timeout};
 
@@ -718,6 +718,12 @@ wait %d seconds for default boot.
 	    }
 	}
     }
+}
+
+sub install_lilo {
+    my ($prefix, $lilo, $fstab, $hds) = @_;
+
+    write_lilo_conf($prefix, $lilo, $fstab, $hds);
 
     log::l("Installing boot loader...");
     $::testing and return;
@@ -755,7 +761,7 @@ sub dev2grub {
     "($grub" . ($3 && "," . ($3 - 1)) . ")";
 }
 
-sub install_grub {
+sub write_grub_config {
     my ($prefix, $lilo, $fstab, $hds) = @_;
     my %dev2bios = (
       (map_index { $_ => "fd$::i" } detect_devices::floppies()),
@@ -854,6 +860,13 @@ __("The highlighted entry will be booted automatically in %d seconds."),
     my $e = "$prefix/boot/.enough_space";
     output $e, 1; -s $e or die _("not enough room in /boot");
     unlink $e;
+    $f;
+}
+
+sub install_grub {
+    my ($prefix, $lilo, $fstab, $hds) = @_;
+
+    my $f = write_grub_config($prefix, $lilo, $fstab, $hds);
 
     log::l("Installing boot loader...");
     $::testing and return;
@@ -971,6 +984,12 @@ sub install {
     }
     $lilo->{keytable} = keytable($prefix, $lilo->{keytable});
 
+    if (arch() =~ /i.86/) {
+	#- when lilo is selected, we don't try to install grub. 
+	#- just create the config file in case it may be useful
+	write_grub_config($prefix, $lilo, $fstab, $hds);
+    }
+
     my %l = grep_each { $::b } %{$lilo->{methods}};
     my @rcs = map {
 	my $f = $bootloader::{"install_$_"} or die "unknown bootloader method $_";
-- 
cgit v1.2.1