On Tue, Jan 21, 2014 at 07:08:29PM +0100, intrigeri wrote:
> Hi,
>
> Cyril Brulebois wrote (29 Sep 2013 23:07:34 GMT) :
> >> + my $modconf;
> >> + if (`uname -r` =~ /(\d+)\.(\d+)\.(\d+)/) {
> >> +- if ($2 > 4) {
> >> ++ if (($2 > 4) || ($1 > 2)) {
>
> > The regex isn't anchored (^) and wants 3 components. The third one was
> > dropped a while ago, but maybe in a version higher than what this module
> > supports anyway. Just thought I'd mention it…
>
> Julian, Andreas: ping? It seems to me that Cyril was asking for
> a clarification at least, and quite possibly for a (trivial) regexp
> improvement. Do you still plan to follow-up on this at some point?
I'm most likely going to ship the patch below in 1.59-2, it just drops
the detection and hard-codes the modprobe.d/ndiswrapper.conf file, as
the other locations are not supported anymore.
-- >8 --
>From 8e6e357f6c0246dbed8bea55df215a46978152ad Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <j...@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
--
Julian Andres Klode - Debian Developer, Ubuntu Member
See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
Please do not top-post if possible.
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
