summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-04 12:42:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-04 12:42:25 +0000
commite5d2c05ffabb6c14fc6840e658f8c92155a052e7 (patch)
tree37454ca46f81be96a871ce5f85742dfa7a30c912
parent86801afe7975649afc27ae78c1f5d68b378992f4 (diff)
downloaddrakx-e5d2c05ffabb6c14fc6840e658f8c92155a052e7.tar
drakx-e5d2c05ffabb6c14fc6840e658f8c92155a052e7.tar.gz
drakx-e5d2c05ffabb6c14fc6840e658f8c92155a052e7.tar.bz2
drakx-e5d2c05ffabb6c14fc6840e658f8c92155a052e7.tar.xz
drakx-e5d2c05ffabb6c14fc6840e658f8c92155a052e7.zip
as when lilo is selected, we don't try to install grub, just create the
config file in case it may be useful
-rw-r--r--perl-install/bootloader.pm23
1 files 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 $_";