diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-03-02 16:09:31 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-03-02 16:09:31 +0000 |
| commit | 0a6678837ce51a3086ec07bac3be9706240a8562 (patch) | |
| tree | 9b107249b81e75adcecb6bfd4e01e2c253b4a0f1 | |
| parent | 5668430f2dfc8512118e734c1263087b7f50856c (diff) | |
| download | drakx-backup-do-not-use-0a6678837ce51a3086ec07bac3be9706240a8562.tar drakx-backup-do-not-use-0a6678837ce51a3086ec07bac3be9706240a8562.tar.gz drakx-backup-do-not-use-0a6678837ce51a3086ec07bac3be9706240a8562.tar.bz2 drakx-backup-do-not-use-0a6678837ce51a3086ec07bac3be9706240a8562.tar.xz drakx-backup-do-not-use-0a6678837ce51a3086ec07bac3be9706240a8562.zip | |
added graphical LILO by default.
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 1dc241f89..55264d62a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -94,7 +94,6 @@ sub setupBootloader { if (!$::expert && $more < 1) { #- automatic - $b->{methods}{lilo} and $b->{methods}{lilo} = "boot-graphic.b"; } elsif (!$::expert) { my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition")); @@ -126,7 +125,7 @@ sub setupBootloader { #- put lilo if grub is chosen, so that /etc/lilo.conf is generated __("Grub") => sub { $b->{methods}{grub} = 1; exists $b->{methods}{lilo} - and $b->{methods}{lilo} = "boot-graphic.b" }), + and $b->{methods}{lilo} = "boot-menu.b" }), if_(exists $b->{methods}{loadlin}, __("Boot from DOS/Windows (loadlin)") => sub { $b->{methods}{loadlin} = 1 }), ); diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 637681098..f30e664df 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -339,7 +339,13 @@ wait %d seconds for default boot. grub => bool(arch() !~ /sparc/ && availableRamMB() < 800), #- don't use grub if more than 800MB loadlin => bool(arch() !~ /sparc/) && -e "/initrd/loopfs/lnx4win", ); - $lilo->{methods} ||= { map { $_ => 1 } grep { $l{$_} } keys %l }; + unless ($lilo->{methods}) { + $lilo->{methods} ||= { map { $_ => 1 } grep { $l{$_} } keys %l }; + if ($lilo->{methods}{lilo} && -e "$prefix/boot/boot-graphic.b") { + $lilo->{methods}{lilo} = "boot-graphic.b"; + exists $lilo->{methods}{grub} and $lilo->{methods}{grub} = undef; + } + } } sub suggest_floppy { |