[Kernel-handbook-general] [PATCH 12/15] Update description of modprobe configuration files
Ben Hutchings
ben at decadent.org.uk
Sat Nov 14 02:56:24 UTC 2015
Configuration files in /etc/modprobe.d must have names ending in .conf
(at least since wheezy).
systemd does not support module parameters in /etc/modules, so don't
mention them.
---
chapter-modules.dbk | 17 ++++++-------
debian/changelog | 1 +
po4a/kernel-handbook.ja.po | 63 +++++++++++++++++++++++++++-------------------
3 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/chapter-modules.dbk b/chapter-modules.dbk
index 77d159a..156f8b6 100644
--- a/chapter-modules.dbk
+++ b/chapter-modules.dbk
@@ -25,12 +25,11 @@ If some modules are not loaded automatically by <literal>udev</literal>, but
you would like them to be loaded during boot, it is possible to force it by
listing the names of the modules in <literal>/etc/modules</literal>. This will
be scanned for the names of the modules (one name per line), which will then be
-loaded using <literal>modprobe</literal>. You can also specify the arguments
-for the modules. For example, a typical <literal>/etc/modules</literal> might
-look like that
+loaded using <literal>modprobe</literal>. For example, a typical
+<literal>/etc/modules</literal> might look like:
</para>
<screen>
-loop max_int=32
+loop
sbp2
</screen>
<para>
@@ -56,15 +55,15 @@ in the boot process, you need to create a custom configuration file for
<literal>modprobe</literal>, which <literal>udev</literal> uses to load the
modules. For example, to pass an <literal>atapi_enabled=1</literal> argument
to the <literal>libata</literal> kernel module, create
-<literal>/etc/modprobe.d/local</literal> file with a following line:
+<literal>/etc/modprobe.d/local.conf</literal> file with the following line:
</para>
<screen>
options libata atapi_enabled=1
</screen>
<para>
-You can choose arbitrary names for the configuration files in
-<literal>/etc/modprobe.d</literal> and put multiple <literal>options</literal>
-lines in the same file.
+You can use any name ending in <literal>.conf</literal> for the
+configuration files in <literal>/etc/modprobe.d</literal> and put
+multiple <literal>options</literal> lines in the same file.
</para>
<para>
Sometimes two different modules claim support for the same device, usually
@@ -72,7 +71,7 @@ because two slightly different versions of the device exist, requiring
different kernel modules to operate. In such situation <literal>udev</literal>
loads both kernel modules, with unpredictable results. To avoid this problem,
you can prevent any module (let's say, <literal>tulip</literal>) from loading
-by creating an arbitrarily named file, containing a line
+by creating a file containing the line:
</para>
<screen>
blacklist tulip
diff --git a/debian/changelog b/debian/changelog
index a478ef7..111979e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ kernel-handbook (1.0.17) UNRELEASED; urgency=medium
* Change links to use HTTP-S where possible
* Update scope to say we're describing Debian 7 onward
* Update copyright dates
+ * Update description of modprobe configuration files
-- Ben Hutchings <ben at decadent.org.uk> Sun, 30 Aug 2015 13:21:25 +0100
diff --git a/po4a/kernel-handbook.ja.po b/po4a/kernel-handbook.ja.po
index 821278d..302d48a 100644
--- a/po4a/kernel-handbook.ja.po
+++ b/po4a/kernel-handbook.ja.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 1.0.16 VERSION\n"
-"POT-Creation-Date: 2015-11-13 23:30+0000\n"
-"PO-Revision-Date: 2015-11-13 22:40+0000\n"
+"POT-Creation-Date: 2015-11-14 01:02+0000\n"
+"PO-Revision-Date: 2015-11-14 01:05+0000\n"
"Last-Translator: Yusuke YATSUO <yyatsuo at debian.or.jp>\n"
"Language-Team: Debian JP Project\n"
"Language: Japanese \n"
@@ -1388,30 +1388,28 @@ msgid ""
"you would like them to be loaded during boot, it is possible to force it by "
"listing the names of the modules in <literal>/etc/modules</literal>. This "
"will be scanned for the names of the modules (one name per line), which will "
-"then be loaded using <literal>modprobe</literal>. You can also specify the "
-"arguments for the modules. For example, a typical <literal>/etc/modules</"
-"literal> might look like that"
+"then be loaded using <literal>modprobe</literal>. For example, a typical "
+"<literal>/etc/modules</literal> might look like:"
msgstr ""
"もし、<literal>udev</literal> で自動的にロードされないモジュールを、起動時に"
"ロードしたければ、そのモジュールを<literal>/etc/modules</literal>に列挙するこ"
"とで、強制的にロードさせることも可能です。このファイルはライン毎にモジュール"
"名をスキャンされ (各ラインに1 モジュール) 、そのモジュールは "
-"<literal>modprobe</literal> でロードされます。モジュールの引数 を指定すること"
-"もできます。例えば、典型的な <literal>/etc/modules</literal> ファイルは以下の"
-"ようになっています。"
+"<literal>modprobe</literal> でロードされます。例えば、典型的な <literal>/"
+"etc/modules</literal> ファイルは以下のようになっています。"
#. type: Content of: <chapter><screen>
-#: chapter-modules.dbk:33
+#: chapter-modules.dbk:32
#, no-wrap
msgid ""
-"loop max_int=32\n"
+"loop\n"
"sbp2\n"
msgstr ""
-"loop max_int=32\n"
+"loop\n"
"sbp2\n"
#. type: Content of: <chapter><para>
-#: chapter-modules.dbk:37
+#: chapter-modules.dbk:36
msgid ""
"To find out what parameters are accepted by a given module, you can use the "
"<literal>modinfo</literal> command, for example:"
@@ -1420,7 +1418,7 @@ msgstr ""
"<literal>modinfo</literal> コマンドを使います。以下に例を示します。"
#. type: Content of: <chapter><screen>
-#: chapter-modules.dbk:41
+#: chapter-modules.dbk:40
#, no-wrap
msgid ""
"# modinfo loop\n"
@@ -1448,48 +1446,61 @@ msgstr ""
"parm: max_part:Maximum number of partitions per loop device (int)\n"
#. type: Content of: <chapter><para>
-#: chapter-modules.dbk:54
+#: chapter-modules.dbk:53
msgid ""
"To add custom arguments to the modules loaded by <literal>udev</literal> "
"early in the boot process, you need to create a custom configuration file "
"for <literal>modprobe</literal>, which <literal>udev</literal> uses to load "
"the modules. For example, to pass an <literal>atapi_enabled=1</literal> "
"argument to the <literal>libata</literal> kernel module, create <literal>/"
-"etc/modprobe.d/local</literal> file with a following line:"
+"etc/modprobe.d/local.conf</literal> file with the following line:"
msgstr ""
"ブートプロセスの初期段階で<literal>udev</literal>によってロードされるモジュー"
"ルに特別な引数を渡すには、<literal>udev</literal>がモジュールのロードに使用す"
"る <literal>modprobe</literal> 用のカスタム設定ファイルを作らなければなりませ"
"ん。例えば、引数 <literal>atapi_enabled=1</literal> を <literal>libata</"
"literal> カーネルモジュールへ渡すには、次の行を含む<literal>/etc/modprobe.d/"
-"local</literal>ファイルを作成します。"
+"local.conf</literal>ファイルを作成します。"
#. type: Content of: <chapter><screen>
-#: chapter-modules.dbk:62
+#: chapter-modules.dbk:61
#, no-wrap
msgid "options libata atapi_enabled=1\n"
msgstr "options libata atapi_enabled=1\n"
#. type: Content of: <chapter><para>
-#: chapter-modules.dbk:65
+#: chapter-modules.dbk:64
+#, fuzzy
+#| msgid ""
+#| "You can choose arbitrary names for the configuration files in <literal>/"
+#| "etc/modprobe.d</literal> and put multiple <literal>options</literal> "
+#| "lines in the same file."
msgid ""
-"You can choose arbitrary names for the configuration files in <literal>/etc/"
-"modprobe.d</literal> and put multiple <literal>options</literal> lines in "
-"the same file."
+"You can use any name ending in <literal>.conf</literal> for the "
+"configuration files in <literal>/etc/modprobe.d</literal> and put multiple "
+"<literal>options</literal> lines in the same file."
msgstr ""
"<literal>/etc/modprobe.d</literal> 内の設定ファイルには、任意の名前を使用で"
"き、複数の <literal>options</literal> 行を同一ファイル内に記述できます。"
#. type: Content of: <chapter><para>
-#: chapter-modules.dbk:70
+#: chapter-modules.dbk:69
+#, fuzzy
+#| msgid ""
+#| "Sometimes two different modules claim support for the same device, "
+#| "usually because two slightly different versions of the device exist, "
+#| "requiring different kernel modules to operate. In such situation "
+#| "<literal>udev</literal> loads both kernel modules, with unpredictable "
+#| "results. To avoid this problem, you can prevent any module (let's say, "
+#| "<literal>tulip</literal>) from loading by creating an arbitrarily named "
+#| "file, containing a line"
msgid ""
"Sometimes two different modules claim support for the same device, usually "
"because two slightly different versions of the device exist, requiring "
"different kernel modules to operate. In such situation <literal>udev</"
"literal> loads both kernel modules, with unpredictable results. To avoid "
"this problem, you can prevent any module (let's say, <literal>tulip</"
-"literal>) from loading by creating an arbitrarily named file, containing a "
-"line"
+"literal>) from loading by creating a file containing the line:"
msgstr ""
"時として、2 つの異なるモジュールが同じデバイスのサポートを宣言していることが"
"あります。たいていの場合、2 つのやや異なるバージョンのデバイスが存在し、動作"
@@ -1500,13 +1511,13 @@ msgstr ""
"literal> ディレクトリ内に"
#. type: Content of: <chapter><screen>
-#: chapter-modules.dbk:78
+#: chapter-modules.dbk:77
#, no-wrap
msgid "blacklist tulip\n"
msgstr "blacklist tulip\n"
#. type: Content of: <chapter><para>
-#: chapter-modules.dbk:81
+#: chapter-modules.dbk:80
msgid ""
"in <literal>/etc/modprobe.d</literal> directory. See the <literal>modprobe</"
"literal> manual page (<literal>man modprobe</literal>) for much more "
--
Ben Hutchings
For every action, there is an equal and opposite criticism. - Harrison
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/kernel-handbook-general/attachments/20151114/1eb72410/attachment-0001.sig>
More information about the Kernel-handbook-general
mailing list