diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2010-05-19 08:58:23 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:43:05 +0200 |
commit | b76270bf9e6dd375e495fec92140a79a79415d27 (patch) | |
tree | 3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff | |
parent | 5a12e7c134274dba706667107d10d231517d3e05 (diff) | |
download | current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz current-b76270bf9e6dd375e495fec92140a79a79415d27.tar.xz |
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits. The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription. Consider picking up
a copy to help support the project. Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality. :-)
Enjoy!
Diffstat (limited to 'source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff')
-rw-r--r-- | source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff b/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff deleted file mode 100644 index 1565d93a6..000000000 --- a/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur module-init-tools-3.6.old/doc/modprobe.conf.sgml module-init-tools-3.6.new/doc/modprobe.conf.sgml ---- module-init-tools-3.6.old/doc/modprobe.conf.sgml 2009-02-04 01:45:24.000000000 -0600 -+++ module-init-tools-3.6.new/doc/modprobe.conf.sgml 2009-02-08 01:42:05.097637263 -0600 -@@ -35,7 +35,9 @@ - <para>Because the <command>modprobe</command> command can add or - remove extra more than one module, due to module dependencies, - we need a method of specifying what options are to be used with -- those modules. <filename>/etc/modprobe.conf</filename> (or, if that does not exist, all files under the <filename>/etc/modprobe.d</filename> directory) specifies -+ those modules. All of the files under the <filename>/etc/modprobe.d/</filename> -+ directory are used, or if that directory does not exist, the -+ <filename>/etc/modprobe.conf</filename> file specifies - those options, as required. It can also be used to create - convenient aliases: alternate names for a module. Finally, it - can override the normal <command>modprobe</command> behavior -diff -Nur module-init-tools-3.6.old/modprobe.c module-init-tools-3.6.new/modprobe.c ---- module-init-tools-3.6.old/modprobe.c 2009-02-04 01:45:24.000000000 -0600 -+++ module-init-tools-3.6.new/modprobe.c 2009-02-08 01:42:05.099636402 -0600 -@@ -1366,8 +1366,8 @@ - - static const char *default_configs[] = - { -- "/etc/modprobe.conf", - "/etc/modprobe.d", -+ "/etc/modprobe.conf", - }; - - static void read_toplevel_config(const char *filename, |