summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-05-19 14:05:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-05-19 14:05:18 +0000
commit5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b (patch)
treebb75495ac4d00366e99583edb885bf8f53ba5951
parent906e4b2dbf4e16595bfd006a6dad0133600bd025 (diff)
downloaddrakx-backup-do-not-use-5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b.tar
drakx-backup-do-not-use-5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b.tar.gz
drakx-backup-do-not-use-5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b.tar.bz2
drakx-backup-do-not-use-5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b.tar.xz
drakx-backup-do-not-use-5b2538065e8bd7804e2d2ab9c8a556ea653e8a3b.zip
when configuring to install grub bootloader, we first install lilo, then grub.
the logic is that we only reread /etc/lilo.conf[1], so we need to write /etc/lilo.conf. but when installing grub, we really do not need to run lilo, we only have to write its config file. [1] because grub/menu.lst lacks some data and because we do neither want to parse both config files nor to resolve conflicts between configuration
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index aad6fd806..6d9b1047f 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -938,7 +938,7 @@ sub install_lilo {
write_lilo_conf($bootloader, $fstab, $hds);
- if (!$::testing && arch() !~ /ia64/) {
+ if (!$::testing && arch() !~ /ia64/ && $bootloader->{method} =~ /lilo/) {
log::l("Installing boot loader...");
my $error;
run_program::rooted($::prefix, "lilo", "2>", \$error) or die "lilo failed: $error";