X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.preset.xml;h=55cb4de174015638d8d21a3c19660f6f873120dc;hb=6bb648a16ae4a682ad4784412af706d2e6a3e4da;hp=238cb383e2e4b62d1a91a632d2be1393eb29c94f;hpb=305f376cec18d276dd4519bbacda013c033c569d;p=elogind.git
diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml
index 238cb383e..55cb4de17 100644
--- a/man/systemd.preset.xml
+++ b/man/systemd.preset.xml
@@ -72,6 +72,11 @@
set of units to be enabled/disabled even before
installing the actual package.
+ For more information on the preset logic please
+ have a look at the Presets
+ document.
+
It is not recommended to ship preset files
within the respective software packages implementing
the units, but rather centralize them in a
@@ -81,7 +86,7 @@
If no preset files exist, systemctl
preset will enable all units that are
installed by default. If this is not desired and all
- units shall rather be disabled it is necessary to ship
+ units shall rather be disabled, it is necessary to ship
a preset file with a single, catchall
"disable *" line. (See example 1,
below.)
@@ -104,7 +109,7 @@
by default, disable to disable
units by default.
- If multiple lines apply to a unit name the
+ If multiple lines apply to a unit name, the
first matching one takes precedence over all
others.
@@ -120,20 +125,19 @@
/etc/ are reserved for the local
administrator, who may use this logic to override the
preset files installed by vendor packages. All preset
- files are sorted by their filename in alphabetical
- order, regardless in which of the directories they
- reside, to guarantee that a specific preset file takes
- precedence over another file with an alphabetically
- earlier name, if both files contain lines that apply
- to the same unit names. It is recommended to prefix
- all file names with two-digit number, to simplify
- ordering.
+ files are sorted by their filename in lexicographic
+ order, regardless of which of the directories they
+ reside in. If multiple files specify the same unit name,
+ the entry in the file with the lexicographically earliest
+ name will be applied. It is recommended to prefix all
+ filenames with a two-digit number and a dash, to simplify
+ the ordering of the files.
If the administrator wants to disable a preset
- file supplied by the vendor the recommended way is to
+ file supplied by the vendor, the recommended way is to
place a symlink to /dev/null in
/etc/systemd/system-preset/
- bearing the same file name.
+ bearing the same filename.
@@ -145,8 +149,8 @@
disable *
- This disables all units. Due to the file name
- prefix 99- it will be read last and
+ This disables all units. Due to the filename
+ prefix 99-, it will be read last and
hence can easily be overridden by spin or
administrator preset policy or suchlike.
@@ -182,7 +186,7 @@ disable *
This enables three specific services and
disables all others. This is useful for administrators
to specifically select the units to enable, and
- disable all others. Due to the file name prefix
+ disable all others. Due to the filename prefix
00- it will be read early and hence
overrides all other preset policy files.