From d75a5f7eee17b836d0cf29f0059f5a4b6e399e60 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 1 Mar 2001 18:45:43 +0000 Subject: added bootloader chooser. added lilo configuration in text menu or graphic menu. --- perl-install/bootloader.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index a2772f371..637681098 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -477,7 +477,13 @@ sub install_lilo($$) { $lilo->{$_} and print F $_ foreach qw(linear lba32 compact prompt restricted); #- print F "password=", $lilo->{password} if $lilo->{restricted} && $lilo->{password}; #- done by msec print F "timeout=", round(10 * $lilo->{timeout}) if $lilo->{timeout}; - print F "message=/boot/message" if $lilo->{message}; + if ($lilo->{message}) { + if (-e "$prefix/boot/$lilo->{methods}{lilo}" && $lilo->{methods}{lilo} eq "boot-graphic.b") { + print F "message=/boot/message-graphic"; + } else { + print F "message=/boot/message"; + } + } print F "menu-scheme=wb:bw:wb:bw"; foreach (@{$lilo->{entries}}) { @@ -506,6 +512,9 @@ sub install_lilo($$) { } } } + #- try to use a specific stage2 if defined and present. + -e "$prefix/boot/$lilo->{methods}{lilo}" and symlinkf $lilo->{methods}{lilo}, "$prefix/boot/boot.b"; + log::l("stage2 of lilo used is " . readlink "$prefix/boot/boot.b"); log::l("Installing boot loader..."); $::testing and return; run_program::rooted($prefix, "lilo", "2>", "/tmp/.error") or die "lilo failed"; -- cgit v1.2.1