summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mageia.org>2012-03-02 18:48:09 +0000
committerAnssi Hannula <anssi@mageia.org>2012-03-02 18:48:09 +0000
commit77c68ac107f5c807c8f288a4bf0b9bf66a060e36 (patch)
tree299e78fcb1794f442397b5512f807980c4a2b9d0
parent617897137d54c37edc9bd9538d5ddf839e7a83d5 (diff)
downloaddrakx-77c68ac107f5c807c8f288a4bf0b9bf66a060e36.tar
drakx-77c68ac107f5c807c8f288a4bf0b9bf66a060e36.tar.gz
drakx-77c68ac107f5c807c8f288a4bf0b9bf66a060e36.tar.bz2
drakx-77c68ac107f5c807c8f288a4bf0b9bf66a060e36.tar.xz
drakx-77c68ac107f5c807c8f288a4bf0b9bf66a060e36.zip
service_harddrake: recognize XZ compressed modules properly (mga#4767)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/service_harddrake2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e13e7dddf..fe58cccb1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- service_harddrake:
+ o recognize XZ compressed proprietary driver modules properly (mga#4767)
+
Version 13.86 - 29 February 2012
- load 'xts' module for crypted fses (Dave Hodgins, mga#3749)
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 8dbe2a8db..2e5c0abbb 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -236,7 +236,7 @@ foreach my $card (@cards) {
next if !$device;
if (find { -e join('', "/lib/modules/", c::kernel_version(), $_) }
- map { ("/dkms/$_", "/dkms-binary/$_", "/kernel/$_") } map { "/drivers/$_" } map { ("extra/$_", "video/$_", "char/$_", "char/drm/$_") } map { $_, "$_.gz" } @{$card->{module_names}}) {
+ map { ("/dkms/$_", "/dkms-binary/$_", "/kernel/$_") } map { "/drivers/$_" } map { ("extra/$_", "video/$_", "char/$_", "char/drm/$_") } map { $_, "$_.xz", "$_.gz" } @{$card->{module_names}}) {
# do not automatically switch from nv to nvidia (in order to handle
# cases where nvidia module crashes the system):