diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-02 13:38:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-02 13:38:59 +0000 |
| commit | c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9 (patch) | |
| tree | ba5ab129853caf3f82f7abdb55e211bc1258b7bb | |
| parent | 32f68380340b4f999bb2fcadd0142a21fef7a855 (diff) | |
| download | drakx-c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9.tar drakx-c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9.tar.gz drakx-c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9.tar.bz2 drakx-c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9.tar.xz drakx-c7f2e4ed116cb4001b97baba1022a4d94b9ab7b9.zip | |
(read) default to lilo if grub config file isn't there (workaround
buggy detectloader only checking MBR)
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 30a007cd2..0c6b38e96 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -75,7 +75,7 @@ sub mkinitrd { sub read() { my $file = sprintf("/etc/%s.conf", arch() =~ /sparc/ ? 'silo' : arch() =~ /ppc/ ? 'yaboot' : 'lilo'); - my $bootloader = $file =~ /lilo/ && detect_bootloader() =~ /GRUB/ ? read_grub() : read_lilo($file); + my $bootloader = $file =~ /lilo/ && detect_bootloader() =~ /GRUB/ && -f "/boot/grub/menu.lst" ? read_grub() : read_lilo($file); if (my $default = find { $_ && $_->{append} } get_label($bootloader->{default}, $bootloader), @{$bootloader->{entries}}) { $bootloader->{perImageAppend} ||= $default->{append}; } |