From 39d6e9c001aee9ee3f21442566fc6322d8125804 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 3 Apr 2008 12:21:03 +0000
Subject: fix detecting modules installed in new dkms locations (/dkms and
 /dkms-binary) instead of /kernel

---
 perl-install/NEWS                         |  4 ++++
 perl-install/share/po/libDrakX.pot        | 15 +++++++++++++++
 perl-install/standalone/service_harddrake |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index ca2725ff3..a962a5b49 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- service_harddrake:
+  o fix detecting modules installed in new dkms locations (/dkms and
+    /dkms-binary) instead of /kernel
+
 Version 10.27 - 3 April 2008
 
 - drakboot:
diff --git a/perl-install/share/po/libDrakX.pot b/perl-install/share/po/libDrakX.pot
index 38dfddd10..42b6b3fa7 100644
--- a/perl-install/share/po/libDrakX.pot
+++ b/perl-install/share/po/libDrakX.pot
@@ -1,3 +1,18 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2008-04-03 09:31+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 1788481cf..03eb718f7 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -55,8 +55,8 @@ my @cards = (
 
 foreach my $card (@cards) {
     next if !find { $_->{driver} =~ /$card->{ldetect_driver_regexp}/ } detect_devices::probeall();
-    if (find { -e join('', "/lib/modules/", c::kernel_version(), "/kernel/drivers/$_") }
-          map { ("extra/$_", "video/$_", "char/$_", "char/drm/$_") } map { $_, "$_.gz" } @{$card->{module_names}}) {
+    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}}) {
 
         # do not automatically switch from nv to nvidia (in order to handle
         # cases where nvidia module crashes the system):
-- 
cgit v1.2.1