1 diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
2 --- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
3 +++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
5 \fI/etc/modprobe.conf\fR configuration file and
6 \fI/etc/modprobe.d\fR directory
7 (see \fBmodprobe.conf\fR(5)).
8 +All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
10 Note that this version of \fBmodprobe\fR does not
11 do anything to the module itself: the work of resolving symbols
12 --- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
13 +++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
14 @@ -1158,6 +1158,10 @@
18 + /* ignore everything in this directory */
19 + if (streq(filename, "/etc/modprobe.d/arch"))
22 /* Reiser4 has file/directory duality: treat it as both. */
23 dir = opendir(filename);