diff --git a/Makefile.am b/Makefile.am
index b62b9be995..8019317504 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -490,7 +490,9 @@ MANPAGES = \
man/os-release.5 \
man/machine-info.5 \
man/modules-load.d.5 \
+ man/systemd-modules-load.service.8 \
man/sysctl.d.5 \
+ man/systemd-sysctl.service.8 \
man/systemd-ask-password.1 \
man/systemd-cat.1 \
man/systemd-machine-id-setup.1 \
@@ -502,11 +504,15 @@ MANPAGES = \
MANPAGES_ALIAS = \
man/reboot.8 \
man/poweroff.8 \
- man/init.1
+ man/init.1 \
+ man/systemd-modules-load.8 \
+ man/systemd-sysctl.8
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-sysctl.8: man/systemd-sysctl.service.8
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -2321,7 +2327,13 @@ INSTALL_DATA_HOOKS += \
binfmt-install-data-hook
MANPAGES += \
- man/binfmt.d.5
+ man/binfmt.d.5 \
+ man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
EXTRA_DIST += \
units/systemd-binfmt.service.in
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 1cc75da9ac..1f5a51db4a 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -42,7 +42,8 @@
binfmt.d
- Configure additional binary formats at boot
+ Configure additional binary formats for
+ executables at boot
@@ -54,10 +55,11 @@
Description
- systemd uses
- files from the above directories to configure
- additional binary formats to register during boot in
- the kernel.
+ At boot,
+ systemd-binfmt.service8
+ reads configuration files from the above directories
+ to register in the kernel additional binary
+ formats for executables.
@@ -73,21 +75,30 @@
ignored. Note that this means you may not use ; and #
as delimiter in binary format rules.
- Each configuration file is named in the style of
- <program>.conf.
- Files in /etc/ override
- files with the same name in /usr/lib/.
- Files in /run override 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 override 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.
+ Each configuration file shall be named in the
+ style of <program>.conf.
+ Files in /etc/ override files
+ with the same name in /usr/lib/
+ and /run/. Files in
+ /run/ override files with the
+ same name in /usr/lib/. Packages
+ should install their configuration files in
+ /usr/lib/, files in
+ /etc/ are reserved for the local
+ administrator, who may use this logic to override the
+ configuration files installed from vendor
+ packages. All files are sorted by their filename in
+ alphabetical order, regardless in which of the
+ directories they reside, to guarantee that a specific
+ configuration file takes precedence over another file
+ with an alphabetically later name.
+
+ If the administrator wants to disable a
+ configuration file supplied by the vendor the
+ recommended way is to place a symlink to
+ /dev/null in
+ /etc/binfmt.d/ bearing the
+ same file name.
@@ -104,6 +115,8 @@
See Also
systemd1,
+ systemd-binfmt.service8,
+ systemd-delta1,
wine8
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index 01013e0222..cdd43d1650 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -54,16 +54,17 @@
Description
- systemd uses
- files from the above directories to configure
+ 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 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.
+ 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.
@@ -74,21 +75,26 @@
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/ override
- files with the same name in /usr/lib/.
- Files in /run override 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 override 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.
+ Each configuration file shall be named in the
+ style of <program>.conf.
+ Files in /etc/ override files
+ with the same name in /usr/lib/
+ and /run/. Files in
+ /run/ override files with the
+ same name in /usr/lib/. Packages
+ should install their configuration files in
+ /usr/lib/, files in
+ /etc/ are reserved for the local
+ administrator, who may use this logic to override the
+ configuration files installed from vendor
+ packages.
+
+ If the administrator wants to disable a
+ configuration file supplied by the vendor the
+ recommended way is to place a symlink to
+ /dev/null in
+ /etc/modules-load.d/ bearing the
+ same file name.
@@ -105,6 +111,8 @@ virtio-net
See Also
systemd1,
+ systemd-modules-load.service8,
+ systemd-delta1,
modprobe8
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 4f30276ad4..a4a495ee32 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -54,10 +54,12 @@
Description
- systemd uses configuration
- files from the above directories to configure
+ At boot,
+ systemd-binfmt.service8
+ reads configuration files from the above directories
+ to configure
sysctl8
- kernel parameters during boot.
+ kernel parameters.
@@ -76,17 +78,17 @@
Each configuration file shall be named in the
style of <program>.conf.
- Files in /run/ override files
- with the same name in /usr/lib/.
- Files in /etc override files with
- the same name in /run/ and
- /usr/lib/. Packages should
- install their configuration files in
+ Files in /etc/ override files
+ with the same name in /usr/lib/
+ and /run/. Files in
+ /run override files with the same
+ name in /usr/lib/. Packages
+ should install their configuration files in
/usr/lib/. Files in
/etc/ are reserved for the local
administrator, who may use this logic to override the
- configuration installed by vendor packages. All
- configuration files are sorted by their name in
+ configuration files installed by vendor packages. All
+ configuration files are sorted by their filename in
alphabetical order, regardless in which of the
directories they reside, to guarantee that a specific
configuration file takes precedence over another file
@@ -97,8 +99,8 @@
configuration file supplied by the vendor the
recommended way is to place a symlink to
/dev/null in
- /etc/sysctl.d carrying with the
- same name.
+ /etc/sysctl.d/ bearing the
+ same file name.
@@ -115,6 +117,8 @@ kernel.domainname=example.com
See Also
systemd1,
+ systemd-sysctl.service8,
+ systemd-delta1,
sysctl8,
sysctl.conf5
diff --git a/man/systemd-binfmt.service.xml b/man/systemd-binfmt.service.xml
new file mode 100644
index 0000000000..73e98363df
--- /dev/null
+++ b/man/systemd-binfmt.service.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+ systemd-binfmt.service
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd-binfmt.service
+ 8
+
+
+
+ systemd-binfmt.service
+ systemd-binfmt
+ Configure additional binary formats for executables at boot
+
+
+
+ sysytemd-binfmt.service
+ /usr/lib/systemd/systemd-binfmt
+
+
+
+ Description
+
+ systemd-binfmt.service is
+ an early-boot service that registers additional binary
+ formats for executables in the kernel.
+
+ See
+ binfmt.d5
+ for information about the configuration of this
+ service.
+
+
+
+ See Also
+
+ systemd1,
+ binfmt.d5,
+ wine8
+
+
+
+
diff --git a/man/systemd-modules-load.service.xml b/man/systemd-modules-load.service.xml
new file mode 100644
index 0000000000..405ae4ffcc
--- /dev/null
+++ b/man/systemd-modules-load.service.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+ systemd-modules-load.service
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd-modules-load.service
+ 8
+
+
+
+ systemd-modules-load.service
+ systemd-modules-load
+ Configure kernel modules to load at boot
+
+
+
+ sysytemd-modules-load.service
+ /usr/lib/systemd/systemd-modules-load
+
+
+
+ Description
+
+ systemd-modules-load.service
+ is an early-boot service that loads kernel modules
+ from static configuration.
+
+ See
+ modules-load.d5
+ for information about the configuration of this
+ service.
+
+
+
+ See Also
+
+ systemd1,
+ modules-load.d5,
+ wine8
+
+
+
+
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml
new file mode 100644
index 0000000000..116fcd00a6
--- /dev/null
+++ b/man/systemd-sysctl.service.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+ systemd-sysctl.service
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd-sysctl.service
+ 8
+
+
+
+ systemd-sysctl.service
+ systemd-sysctl
+ Configure kernel parameters at boot
+
+
+
+ sysytemd-sysctl.service
+ /usr/lib/systemd/systemd-sysctl
+
+
+
+ Description
+
+ systemd-sysctl.service is
+ an early-boot service that configures
+ sysctl8
+ kernel parameters.
+
+ See
+ sysctl.d5
+ for information about the configuration of this
+ service.
+
+
+
+ See Also
+
+ systemd1,
+ sysctl.d5,
+ sysctl8,
+ wine8
+
+
+
+
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
index a7cda979d4..02dfe774df 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -7,13 +7,14 @@
[Unit]
Description=Set Up Additional Binary Formats
-Documentation=man:binfmt.d(5)
+Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
Before=sysinit.target shutdown.target
ConditionPathIsReadWrite=/proc/sys/
+ConditionDirectoryNotEmpty=|/lib/binfmt.d
ConditionDirectoryNotEmpty=|/usr/lib/binfmt.d
ConditionDirectoryNotEmpty=|/usr/local/lib/binfmt.d
ConditionDirectoryNotEmpty=|/etc/binfmt.d
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
index 8f25091986..ff6613f81a 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -7,7 +7,7 @@
[Unit]
Description=Load Kernel Modules
-Documentation=man:modules-load.d(5)
+Documentation=man:systemd-modules-load.service(8) man:modules-load.d(5)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index d8849e7929..45e1ceb25c 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -7,7 +7,7 @@
[Unit]
Description=Apply Kernel Variables
-Documentation=man:sysctl.d(5)
+Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service