X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fbinfmt.d.xml;h=07ae0ac231b1e965737bf9030b7ec8fa19bc5fec;hb=5c315b4f2a43b1a8e1951d83dd326d2a8c615922;hp=5a8803f661997e0d4ae0c2e344576d797697e125;hpb=db1413d7380acacc4e50faf801ca0d401da89764;p=elogind.git
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 5a8803f66..07ae0ac23 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -7,16 +7,16 @@
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 .
-->
@@ -42,28 +42,28 @@
binfmt.d
- Configure additional binary formats at boot
+ Configure additional binary formats for
+ executables at boot
- /usr/lib/binfmt.d/*.conf
/etc/binfmt.d/*.conf
/run/binfmt.d/*.conf
+ /usr/lib/binfmt.d/*.conf
Description
- systemd uses
- files from the above directories to configure
- additional binary formats to register during boot in
- the kernel. Each configuration file is named in the
- style of
- <program>.conf.
+ At boot,
+ systemd-binfmt.service8
+ reads configuration files from the above directories
+ to register in the kernel additional binary
+ formats for executables.
- Configuration Format
+ Configuration Format
Each file contains a list of binfmt_misc kernel
binary format rules. Consult
- 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.
+ 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