Signed-off-by: Keegan McAllister <keegan@xxxxxxxxxxx>
---
doc/modprobe.conf.sgml | 26 ++++++++++++++++++++++++++
doc/modprobe.sgml | 7 +++++++
2 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/doc/modprobe.conf.sgml b/doc/modprobe.conf.sgml
index 74fdb7c..67693a9 100644
--- a/doc/modprobe.conf.sgml
+++ b/doc/modprobe.conf.sgml
@@ -44,6 +44,13 @@
special requirements (such as inserting more than one module).
</para>
<para>
+ If a file in <filename>/etc/modprobe.d</filename> is a broken symlink, it
+ will be silently ignored unless <command>modprobe</command> is run with
+ the <option>--verbose</option> option. This means that an application
+ which needs to make transient changes to <command>modprobe</command>
+ behavior may create a permanent symlink into its own directory tree.
+ </para>
+ <para>
Note that module and alias names (like other module names) can
have - or _ in them: both are interchangable throughout all the
module commands as underscore conversion happens automatically.
@@ -145,6 +152,25 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term>moduledir <replaceable>path</replaceable>
+ </term>
+ <listitem>
+ <para>
+ The <command>moduledir</command> command allows you to override the
+ module directory path <filename>/lib/modules</filename>.
+ </para>
+ <para>
+ The <option>-d</option> option to
+ <command>modprobe</command> will prefix the module directory path, whether
+ or not that path is set by <command>moduledir</command>.
+ </para>
+ <para>
+ Only the last <command>moduledir</command> command processed by
+ <command>modprobe</command> will have any effect.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term>options <replaceable>modulename</replaceable> <replaceable>option...</replaceable>
</term>
<listitem>
diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml
index a62043d..8dddc90 100644
--- a/doc/modprobe.sgml
+++ b/doc/modprobe.sgml
@@ -181,6 +181,13 @@
look for modules in
<filename><replaceable>/DIR</replaceable>/lib/modules/<replaceable>RELEASE</replaceable></filename>.
</para>
+ <para>
+ The middle part of this path may be set by the
+ <command>moduledir</command> configuration command. See
+ <citerefentry>
+ <refentrytitle>modprobe.conf</refentrytitle><manvolnum>5</manvolnum>
+ </citerefentry>.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
