diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-07 17:29:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-07 17:29:58 +0000 |
| commit | 132e12d104425e16ba64d85cee9c47030a4dd262 (patch) | |
| tree | 1511d387417dc20198537d052e52f387a1046e23 | |
| parent | 8f3ee68c119625d19a8addfdfcf375425828cc1c (diff) | |
| download | drakx-132e12d104425e16ba64d85cee9c47030a4dd262.tar drakx-132e12d104425e16ba64d85cee9c47030a4dd262.tar.gz drakx-132e12d104425e16ba64d85cee9c47030a4dd262.tar.bz2 drakx-132e12d104425e16ba64d85cee9c47030a4dd262.tar.xz drakx-132e12d104425e16ba64d85cee9c47030a4dd262.zip | |
handle lilo not installed
| -rw-r--r-- | perl-install/bootloader.pm | 16 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 25c352e5f..51b59c34d 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -667,10 +667,10 @@ sub method_choices { my %choices = ( if_(arch() =~ /sparc/, 'silo' => N("SILO"), - ), if_(arch() !~ /sparc|ppc/ && !isLoopback(fsedit::get_root($fstab)), + ), if_(arch() !~ /sparc|ppc/ && !isLoopback(fsedit::get_root($fstab)) && whereis_binary('lilo'), if_(!detect_devices::matching_desc('ProSavageDDR'), 'lilo-graphic' => N("LILO with graphical menu")), 'lilo-menu' => N("LILO with text menu"), - ), if_(arch() !~ /sparc|ppc/ && !isRAID(fsedit::get_root($fstab)), + ), if_(arch() !~ /sparc|ppc/ && !isRAID(fsedit::get_root($fstab)) && whereis_binary('grub'), 'grub' => N("Grub"), ), if_(arch() =~ /ppc/, 'yaboot' => N("Yaboot"), @@ -1193,15 +1193,9 @@ sub install { } $bootloader->{keytable} = keytable($bootloader->{keytable}); - my @methods = $bootloader->{method} eq 'grub' ? ('lilo-graphic', 'grub') : $bootloader->{method}; - my @rcs = map { - my ($main_method) = /(\w+)/; - my $f = $bootloader::{"install_$main_method"} or die "unknown bootloader method $_"; - eval { $f->($bootloader, $fstab, $hds, $_) }; - $@; - } @methods; - - die $rcs[0] if every { $_ } @rcs; + my ($main_method) = $bootloader->{method} =~ /(\w+)/; + my $f = $bootloader::{"install_$main_method"} or die "unknown bootloader method $bootloader->{method}"; + $f->($bootloader, $fstab, $hds, $bootloader->{method}); } 1; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 31646e367..8265e0ed6 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -17,7 +17,7 @@ use loopback; use c; -our %preferred = map { $_ => undef } qw(perl-base XFree86-libs gstreamer-oss openjade ctags glibc curl sane-backends perl-GTK postfix mdkkdm gcc gcc-cpp gcc-c++ proftpd ghostscript-X vim-minimal kernel db1 db2 libxpm4 zlib1 libncurses5 harddrake cups apache); +our %preferred = map { $_ => undef } qw(lilo perl-base XFree86-libs gstreamer-oss openjade ctags glibc curl sane-backends perl-GTK postfix mdkkdm gcc gcc-cpp gcc-c++ proftpd ghostscript-X vim-minimal kernel db1 db2 libxpm4 zlib1 libncurses5 harddrake cups apache); #- lower bound on the left ( aka 90 means [90-100[ ) our %compssListDesc = ( |