X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fbinfmt.d.xml;h=f5ec805e29c41986c40456bf3e2dde2383f547da;hp=64c27554e672bf9b609b944c254df06b2e36bd02;hb=83cd6b754b270091840456a2c8a66dae19f5a7dc;hpb=c91faef3b3facfdf13282aee957af25dd555890b
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 64c27554e..f5ec805e2 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -47,19 +47,17 @@
/etc/binfmt.d/*.conf
+ /run/binfmt.d/*.conf
+ /usr/lib/binfmt.d/*.conf
Description
systemd uses
- /etc/binfmt.d/ to configure
+ 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
- /etc/binfmt.d/<program>.conf.
-
-
+ the kernel.
@@ -75,11 +73,21 @@
ignored. Note that this means you may not use ; and #
as delimiter in binary format rules.
- Configuration files are loaded in alphabetical
- order. To ensure that a specific rule takes precedence
- over another place it in a file with an alphabetically
- later name.
-
+ 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.