diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-22 16:07:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-22 16:07:33 +0000 |
| commit | 6aef587faacdc572418104a242aea3db52fdc042 (patch) | |
| tree | 6d4d69b39661b0252ebf87a0bac5c983d9112175 | |
| parent | 618914115cdfd8b569cb2c34414a29ba346f3693 (diff) | |
| download | drakx-backup-do-not-use-6aef587faacdc572418104a242aea3db52fdc042.tar drakx-backup-do-not-use-6aef587faacdc572418104a242aea3db52fdc042.tar.gz drakx-backup-do-not-use-6aef587faacdc572418104a242aea3db52fdc042.tar.bz2 drakx-backup-do-not-use-6aef587faacdc572418104a242aea3db52fdc042.tar.xz drakx-backup-do-not-use-6aef587faacdc572418104a242aea3db52fdc042.zip | |
(suggest): fix kernel 2.2 secure adding in menu
| -rw-r--r-- | perl-install/bootloader.pm | 12 |
1 files 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", |