From 503298b7243b60543ef036037508684c30e48ddb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Apr 2020 22:50:50 +0200 Subject: [PATCH] man: document new specifiers --- man/standard-specifiers.xml | 32 ++++++++++++++++++++++++++++++++ man/systemd.dnssd.xml | 19 +++++++++++++------ man/systemd.unit.xml | 13 ++++++++++++- man/sysusers.d.xml | 5 +++++ man/tmpfiles.d.xml | 8 +++++++- 5 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 man/standard-specifiers.xml diff --git a/man/standard-specifiers.xml b/man/standard-specifiers.xml new file mode 100644 index 0000000000..c5cd6a8862 --- /dev/null +++ b/man/standard-specifiers.xml @@ -0,0 +1,32 @@ + + + + + + + %a + Architecture + A short string identifying the architecture of the local system. A string such as x86, x86-64 or arm64. See the architectures defined for ConditionArchitecture= in systemd.unit5 for a full list. + + + %B + Operating system build ID + The operating system build identifier of the running system, as read from the BUILD_ID= field of /etc/os-release. If not set, resolves to an empty string. See os-release5 for more information. + + + %o + Operating system ID + The operating system identifier of the running system, as read from the ID= field of /etc/os-release. See os-release5 for more information. + + + %w + Operating system version ID + The operating system version identifier of the running system, as read from the VERSION_ID= field of /etc/os-release. If not set, resolves to an empty string. See os-release5 for more information. + + + %W + Operating system variant ID + The operating system variant identifier of the running system, as read from the VARIANT_ID= field of /etc/os-release. If not set, resolves to an empty string. See os-release5 for more information. + + diff --git a/man/systemd.dnssd.xml b/man/systemd.dnssd.xml index 1ac760eec7..d70cc43944 100644 --- a/man/systemd.dnssd.xml +++ b/man/systemd.dnssd.xml @@ -3,7 +3,9 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - + systemd.dnssd @@ -87,26 +89,31 @@ - - %m - Machine ID - The machine ID of the running system, formatted as string. See machine-id5 for more information. - + %b Boot ID The boot ID of the running system, formatted as string. See random4 for more information. + %H Host name The hostname of the running system. + + %m + Machine ID + The machine ID of the running system, formatted as string. See machine-id5 for more information. + + %v Kernel release Identical to uname -r output. + + diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index c26937e752..d570016b2f 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -6,7 +6,8 @@ ]> - + systemd.unit @@ -1708,11 +1709,18 @@ + + + %a + Architecture + A short string identifying the architecture of the local system. A string such as x86, x86-64 or arm64. See the architectures defined for ConditionArchitecture= above for a full list. + %b Boot ID The boot ID of the running system, formatted as string. See random4 for more information. + %C Cache directory root @@ -1770,6 +1778,7 @@ Note that this setting is not influenced by the Us Machine ID The machine ID of the running system, formatted as string. See machine-id5 for more information. + %n Full unit name @@ -1844,6 +1853,8 @@ Note that this setting is not influenced by the Us Directory for larger and persistent temporary files This is either /var/tmp or the path $TMPDIR, $TEMP or $TMP are set to. + + %% Single percent sign diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml index f0e0f2bedc..2be41c1030 100644 --- a/man/sysusers.d.xml +++ b/man/sysusers.d.xml @@ -251,11 +251,13 @@ r - 500-900 + %b Boot ID The boot ID of the running system, formatted as string. See random4 for more information. + %H Host name @@ -266,6 +268,7 @@ r - 500-900 Machine ID The machine ID of the running system, formatted as string. See machine-id5 for more information. + %T Directory for temporary files @@ -281,6 +284,8 @@ r - 500-900 Directory for larger and persistent temporary files This is either /var/tmp or the path $TMPDIR, $TEMP or $TMP are set to. + + %% Escaped % diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index a29c913ff0..79fd6a9921 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -6,7 +6,8 @@ Copyright © 2010 Brandon Philips --> - + tmpfiles.d @@ -631,11 +632,13 @@ w- /proc/sys/vm/swappiness - - - - 10 + %b Boot ID The boot ID of the running system, formatted as string. See random4 for more information. + %C System or user cache directory @@ -661,6 +664,7 @@ w- /proc/sys/vm/swappiness - - - - 10 Machine ID The machine ID of the running system, formatted as string. See machine-id5 for more information. + %S System or user state directory @@ -706,6 +710,8 @@ w- /proc/sys/vm/swappiness - - - - 10 Directory for larger and persistent temporary files This is either /var/tmp or the path $TMPDIR, $TEMP or $TMP are set to. + + %% Escaped %