summaryrefslogtreecommitdiffstats
path: root/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2011-04-25 13:37:00 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:45:18 +0200
commit75a4a592e5ccda30715f93563d741b83e0dcf39e (patch)
tree502f745607e77a2c4386ad38d818ddcafe81489c /source/a/module-init-tools/modprobe.ignore_some_suffixes.diff
parentb76270bf9e6dd375e495fec92140a79a79415d27 (diff)
downloadcurrent-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz
current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.xz
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun!
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;