From 6aef587faacdc572418104a242aea3db52fdc042 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 22 Sep 2001 16:07:33 +0000 Subject: (suggest): fix kernel 2.2 secure adding in menu --- perl-install/bootloader.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index da71cc0a5..28875f979 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -318,13 +318,13 @@ wait %d seconds for default boot. #- manage older kernel if installed. foreach (qw(2.2 hack)) { - my $hasOld = -e "$prefix/boot/vmlinuz-$_"; - if ($hasOld) { - my $oldVersion = first(readlink("$prefix/boot/vmlinuz-$_") =~ /vmlinuz-(.*mdk)/); - my $oldSecure = -e "$prefix/boot/vmlinuz-${_}secure"; - my $oldSMP = $isSMP && -e "$prefix/boot/vmlinuz-${_}smp"; + my $f = "$prefix/boot/vmlinuz-$_"; + if (-e $f) { + my $oldVersion = first(readlink($f) =~ /vmlinuz-(.*mdk)/); + my $oldSecure = -e "$prefix/boot/vmlinuz-${oldVersion}secure"; + my $oldSMP = -e "$prefix/boot/vmlinuz-${oldVersion}smp"; - add_kernel($prefix, $lilo, $oldVersion, $oldSecure ? "${_}secure" : $oldSMP ? "${_}smp" : $_, + add_kernel($prefix, $lilo, $oldVersion, $_ . ($oldSecure ? 'secure' : $oldSMP ? 'smp' : ''), { label => "linux-$_", root => "/dev/$root", -- cgit v1.2.1