From 42a2c73e67c7127ad44a6861d0fd22401d17291d Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Fri, 8 Mar 2002 14:35:26 +0000 Subject: fixed NVIDIA support to use newer kernel naming conventions. --- perl-install/standalone/XFdrake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 674366c84..e432b9681 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -85,8 +85,9 @@ if ($list{NVIDIA_GLX}) { $ext and $ext = "-$ext"; $list{"NVIDIA_kernel-$version-$release$ext"} or die "no NVIDIA kernel for current kernel"; $select{"NVIDIA_kernel-$version-$release$ext"} = 1; - foreach (`rpm -q kernel kernel-smp kernel-entreprise kernel22 kernel22-smp kernel22-secure`) { - ($ext, $version, $release) = /kernel[^-]*(-[^-]*)-([^-]*)-([^-]*mdk)/; + foreach (`rpm -qa kernel-2* kernel-smp-2* kernel-enterprise-2* kernel-secure-2* kernel kernel-smp kernel-entreprise kernel22 kernel22-smp kernel22-secure`) { + ($ext, $version, $release) = /kernel[^-]*(-\D[^-]*)-([^-]*)-([^-]*mdk)?/; + $release or ($version, $release) = $version =~ /(.*?)\.(\d+mdk)/; $list{"NVIDIA_kernel-$version-$release$ext"} and $select{"NVIDIA_kernel-$version-$release$ext"} = 1; } $allowNVIDIA_rpms = [ keys(%select), "NVIDIA_GLX" ]; -- cgit v1.2.1