diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-03-08 14:35:26 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-03-08 14:35:26 +0000 |
| commit | 42a2c73e67c7127ad44a6861d0fd22401d17291d (patch) | |
| tree | eddeda52148dbf3b4beeaba5b485346d64f9a479 | |
| parent | 0a347b4c6c86f9ede2162b8b3810ce4198fd63b1 (diff) | |
| download | drakx-42a2c73e67c7127ad44a6861d0fd22401d17291d.tar drakx-42a2c73e67c7127ad44a6861d0fd22401d17291d.tar.gz drakx-42a2c73e67c7127ad44a6861d0fd22401d17291d.tar.bz2 drakx-42a2c73e67c7127ad44a6861d0fd22401d17291d.tar.xz drakx-42a2c73e67c7127ad44a6861d0fd22401d17291d.zip | |
fixed NVIDIA support to use newer kernel naming conventions.
| -rwxr-xr-x | perl-install/standalone/XFdrake | 5 |
1 files changed, 3 insertions, 2 deletions
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" ]; |