Package: ndiswrapper / 1.59-2

Add-support-for-3.x-kernel-versions.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From 8e6e357f6c0246dbed8bea55df215a46978152ad Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Sat, 11 Jan 2014 17:15:39 +0100
Subject: [PATCH] Hardcode /etc/modprobe.d/ndiswrapper.conf

We do not support modprobe.conf anymore. The code failed to work with
recent kernels that only export two components in the version,
so things were broken a bit anyway.

Bug-Debian: http://bugs.debian.org/724890
---
 utils/ndiswrapper | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/utils/ndiswrapper b/utils/ndiswrapper
index 1dd1736..c462934 100755
--- a/utils/ndiswrapper
+++ b/utils/ndiswrapper
@@ -35,7 +35,7 @@ my $confdir = "/etc/ndiswrapper";
 my $src_dir;
 my $driver_name;
 my @source_disks_files;
-my $modconf;
+my $modconf = "/etc/modprobe.d/ndiswrapper.conf";
 
 my $re_dev_id = "([[:xdigit:]]{4})";
 my $re_sub_dev_conf = "$re_dev_id:$re_dev_id:$re_dev_id:$re_dev_id" .
@@ -970,22 +970,6 @@ if (@ARGV < 1) {
 	exit(1);
 }
 
-if (`uname -r` =~ /(\d+)\.(\d+)\.(\d+)/) {
-    if ($2 > 4) {
-	if (-d "/etc/modprobe.d") {
-	    $modconf = "/etc/modprobe.d/ndiswrapper.conf";
-	} else {
-	    $modconf = "/etc/modprobe.conf";
-	}
-    } else {
-	if (-d "/etc/modutils") {
-	    $modconf = "/etc/modutils/ndiswrapper";
-	} else {
-	    $modconf = "/etc/modules.conf";
-	}
-    }
-}
-
 my $res;
 my $dbg_file;
 
-- 
1.8.5.2