X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmodules-load.d.xml;h=34a937db68b6cfafedb3b547f1ab3539c3140368;hb=88a60da054759f763e2be7bb88c7f88919c6d46f;hp=e2f7d5c68cbda91d06c159fbb6a225c04a94ae06;hpb=fc1a2e06a2eab6ca16664adb83b61fe958f00598;p=elogind.git
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index e2f7d5c68..34a937db6 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -7,106 +7,95 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
-
-
-
- modules-load.d
- systemd
-
-
-
- Developer
- Lennart
- Poettering
- lennart@poettering.net
-
-
-
-
-
- modules-load.d
- 5
-
-
-
- modules-load.d
- Configure kernel modules to load at boot
-
-
-
- /etc/modules-load.d/*.conf
- /run/modules-load.d/*.conf
- /usr/lib/modules-load.d/*.conf
-
-
-
- Description
-
- systemd uses
- files from the above directories to configure
- kernel modules to load during boot in a static list.
- Each configuration file is named in the style of
- /etc/modules-load.d/<program>.conf. Note
- that it is usually a better idea to use the automatic
- module loading by PCI ID, by DMI ID or similar
- triggers configured in the kernel modules themselves
- instead of relying on static configuration like
- this.
-
-
-
- Configuration Format
-
- The configuration files should simply contain a
- list of kernel module names to load, separated by
- newlines. Empty lines and lines whose first
- non-whitespace character is # or ; are ignored.
-
- Each configuration file is named in the style of
- <program>.conf.
- Files in /etc/ overwrite
- files with the same name in /usr/lib/.
- Files in /run overwrite files with
- the same name in /etc/ and
- /usr/lib/. Packages should install their
- configuration files in /usr/lib/, files
- in /etc/ are reserved for the local
- administration, which possibly decides to overwrite the
- configurations installed from packages. All files are sorted
- by filename in alphabetical order, regardless in which of the
- directories they reside, to ensure that a specific
- configuration file takes precedence over another file with
- an alphabetically later name.
-
-
-
- Example
-
- /etc/modules-load.d/virtio-net.conf example:
-
- # Load virtio-net.ko at boot
+
+
+
+ modules-load.d
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ modules-load.d
+ 5
+
+
+
+ modules-load.d
+ Configure kernel modules to load at boot
+
+
+
+ /etc/modules-load.d/*.conf
+ /run/modules-load.d/*.conf
+ /usr/lib/modules-load.d/*.conf
+
+
+
+ Description
+
+ systemd-modules-load.service8
+ reads files from the above directories which contain kernel
+ modules to load during boot in a static list. Each configuration
+ file is named in the style of
+ /etc/modules-load.d/program.conf.
+ Note that it is usually a better idea to rely on the automatic
+ module loading by PCI IDs, USB IDs, DMI IDs or similar triggers
+ encoded in the kernel modules themselves instead of static
+ configuration like this. In fact, most modern kernel modules are
+ prepared for automatic loading already.
+
+
+
+ Configuration Format
+
+ The configuration files should simply contain a list of
+ kernel module names to load, separated by newlines. Empty lines
+ and lines whose first non-whitespace character is # or ; are
+ ignored.
+
+
+
+
+
+ Example
+
+ /etc/modules-load.d/virtio-net.conf example:
+
+ # Load virtio-net.ko at boot
virtio-net
-
-
-
-
- See Also
-
- systemd1,
- modprobe8
-
-
+
+
+
+
+ See Also
+
+ systemd1,
+ systemd-modules-load.service8,
+ systemd-delta1,
+ modprobe8
+
+