aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-31 16:00:34 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-31 16:00:34 +0200
commit9393a8774c1acd60deea40007061b9ffc783bf7e (patch)
treea658d0f10497e4a4d25adbfe4ece090ea3b120f1 /man/binfmt.d.xml
parentunits: add Documentation= field to console-getty.service (diff)
downloadsystemd-9393a8774c1acd60deea40007061b9ffc783bf7e.tar.gz
systemd-9393a8774c1acd60deea40007061b9ffc783bf7e.tar.bz2
systemd-9393a8774c1acd60deea40007061b9ffc783bf7e.zip
man: add documentation for the binfmt, modules-load, sysctl services
Diffstat (limited to 'man/binfmt.d.xml')
-rw-r--r--man/binfmt.d.xml53
1 files changed, 33 insertions, 20 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 1cc75da9a..1f5a51db4 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -42,7 +42,8 @@
<refnamediv>
<refname>binfmt.d</refname>
- <refpurpose>Configure additional binary formats at boot</refpurpose>
+ <refpurpose>Configure additional binary formats for
+ executables at boot</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -54,10 +55,11 @@
<refsect1>
<title>Description</title>
- <para><command>systemd</command> uses
- files from the above directories to configure
- additional binary formats to register during boot in
- the kernel.</para>
+ <para>At boot,
+ <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ reads configuration files from the above directories
+ to register in the kernel additional binary
+ formats for executables.</para>
</refsect1>
<refsect1>
@@ -73,21 +75,30 @@
ignored. Note that this means you may not use ; and #
as delimiter in binary format rules.</para>
- <para>Each configuration file is named in the style of
- <filename>&lt;program&gt;.conf</filename>.
- Files in <filename>/etc/</filename> override
- files with the same name in <filename>/usr/lib/</filename>.
- Files in <filename>/run</filename> override files with
- the same name in <filename>/etc/</filename> and
- <filename>/usr/lib/</filename>. Packages should install their
- configuration files in <filename>/usr/lib/</filename>, files
- in <filename>/etc/</filename> 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.</para>
+ <para>Each configuration file shall be named in the
+ style of <filename>&lt;program&gt;.conf</filename>.
+ Files in <filename>/etc/</filename> override files
+ with the same name in <filename>/usr/lib/</filename>
+ and <filename>/run/</filename>. Files in
+ <filename>/run/</filename> override files with the
+ same name in <filename>/usr/lib/</filename>. Packages
+ should install their configuration files in
+ <filename>/usr/lib/</filename>, files in
+ <filename>/etc/</filename> 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.</para>
+
+ <para>If the administrator wants to disable a
+ configuration file supplied by the vendor the
+ recommended way is to place a symlink to
+ <filename>/dev/null</filename> in
+ <filename>/etc/binfmt.d/</filename> bearing the
+ same file name.</para>
</refsect1>
<refsect1>
@@ -104,6 +115,8 @@
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
</refsect1>