summaryrefslogtreecommitdiffstats
path: root/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/module-init-tools/modprobe.ignore_some_suffixes.diff')
-rw-r--r--source/a/module-init-tools/modprobe.ignore_some_suffixes.diff14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
index a65fba0ad..5517502b7 100644
--- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
+++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
@@ -1,6 +1,6 @@
-diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modprobe.c
---- module-init-tools-3.11.orig/modprobe.c 2009-10-15 04:59:28.000000000 -0500
-+++ module-init-tools-3.11.new/modprobe.c 2009-10-15 08:14:12.108359199 -0500
+diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c
+--- module-init-tools-3.12.orig//modprobe.c 2010-05-04 00:19:27.000000000 -0500
++++ module-init-tools-3.12/modprobe.c 2010-06-08 04:32:46.655088739 -0500
@@ -38,6 +38,7 @@
#include <asm/unistd.h>
#include <sys/wait.h>
@@ -9,8 +9,8 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp
#include "util.h"
#include "elfops.h"
-@@ -861,6 +862,20 @@
- options, commands, aliases, blacklist);
+@@ -789,6 +790,20 @@
+ return strsep(string, delim);
}
+/* Let's exclude a few file extensions */
@@ -28,9 +28,9 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp
+}
+
static int parse_config_scan(const char *filename,
- const char *name,
+ struct modprobe_conf *conf,
int dump_only,
-@@ -887,6 +902,8 @@
+@@ -1066,6 +1081,8 @@
while ((i = readdir(dir)) != NULL) {
size_t len;