From 7f64f4f0b7b6e29cf6c81a1d2361372378ad948b Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 12 Apr 2001 14:01:07 +0000 Subject: fixed wrong kernel version extraction (typically for upgrade). --- perl-install/install_any.pm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 0c878a08b..dcdb13900 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -197,17 +197,11 @@ sub clean_postinstall_rpms() { #-###################################################################################### sub kernelVersion { my ($o) = @_; - if (my $link = (arch() !~ /ppc/) ? - readlink("$o->{prefix}/boot/vmlinuz") : - readlink("$o->{prefix}/boot/vmlinux")) { - first($link =~ /-(.*mdk)/); - } else { - require pkgs; - my $p = pkgs::packageByName($o->{packages}, "kernel"); - $p ||= pkgs::packageByName($o->{packages}, "kernel22"); - $p or die "I couldn't find the kernel package!"; - pkgs::packageVersion($p) . "-" . pkgs::packageRelease($p); - } + require pkgs; + my $p = pkgs::packageByName($o->{packages}, "kernel"); + $p ||= pkgs::packageByName($o->{packages}, "kernel22"); + $p or die "I couldn't find the kernel package!"; + pkgs::packageVersion($p) . "-" . pkgs::packageRelease($p); } -- cgit v1.2.1