summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-06-06 19:22:20 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-07-10 13:35:26 +0200
commit36cf45078c0d411d72f70327d2ae1d29e8079a34 (patch)
tree9faca141c8390279688ef2ee065cdee240df7d6b /man
parentc1d95b713a50c1dee6d82c27d7ed5ffad9daf603 (diff)
downloadsystemd-36cf45078c0d411d72f70327d2ae1d29e8079a34.tar.gz
systemd-36cf45078c0d411d72f70327d2ae1d29e8079a34.tar.bz2
systemd-36cf45078c0d411d72f70327d2ae1d29e8079a34.zip
Add config and kernel commandline option to use short identifiers
No functional change, just docs and configuration and parsing. v2: - change ShortIdentifiers=yes|no to StatusUnitFormat=name|description.
Diffstat (limited to 'man')
-rw-r--r--man/kernel-command-line.xml1
-rw-r--r--man/systemd-system.conf.xml10
-rw-r--r--man/systemd.xml10
3 files changed, 21 insertions, 0 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 903ff924f5..f9408a028d 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -59,6 +59,7 @@
<term><varname>systemd.confirm_spawn</varname></term>
<term><varname>systemd.service_watchdogs</varname></term>
<term><varname>systemd.show_status</varname></term>
+ <term><varname>systemd.status_unit_format=</varname></term>
<term><varname>systemd.log_target=</varname></term>
<term><varname>systemd.log_level=</varname></term>
<term><varname>systemd.log_location=</varname></term>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 10eeb7e690..5b80479a0a 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -245,6 +245,16 @@
</varlistentry>
<varlistentry>
+ <term><varname>StatusUnitFormat=</varname></term>
+
+ <listitem><para>Takes either <option>name</option> or <option>description</option> as the value. If
+ <option>name</option>, the system manager will use unit names in status messages, instead of the
+ longer and more informative descriptions set with <varname>Description=</varname>, see
+ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>DefaultTimerAccuracySec=</varname></term>
<listitem><para>Sets the default accuracy of timer units. This
diff --git a/man/systemd.xml b/man/systemd.xml
index deba17dc42..41c0f5f643 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1028,6 +1028,16 @@
</varlistentry>
<varlistentry>
+ <term><varname>systemd.status_unit_format=</varname></term>
+
+ <listitem><para>Takes either <option>name</option> or <option>description</option> as the value. If
+ <option>name</option>, the system manager will use unit names in status messages. If specified,
+ overrides the system manager configuration file option <option>StatusUnitFormat=</option>, see
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>systemd.log_target=</varname></term>
<term><varname>systemd.log_level=</varname></term>
<term><varname>systemd.log_location=</varname></term>