summaryrefslogtreecommitdiffstats
path: root/man/systemd.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-08-01 17:16:39 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-09-16 18:08:54 +0200
commit28f0aef4c7e85f15346d68dcd6a08592af7c1662 (patch)
tree1f26052223ac0cadb9716cf2485cd969e2c86f4e /man/systemd.xml
parentAdd support for SystemdOptions EFI var to augment /proc/cmdline (diff)
downloadsystemd-28f0aef4c7e85f15346d68dcd6a08592af7c1662.tar.xz
systemd-28f0aef4c7e85f15346d68dcd6a08592af7c1662.zip
man: document SystemdOptions variable
Diffstat (limited to 'man/systemd.xml')
-rw-r--r--man/systemd.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/man/systemd.xml b/man/systemd.xml
index c01cf46e81..957d37dcd9 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -916,13 +916,13 @@
<refsect1>
<title>Kernel Command Line</title>
- <para>When run as system instance systemd parses a number of
- kernel command line arguments<footnote><para>If run inside a Linux
- container these arguments may be passed as command line arguments
- to systemd itself, next to any of the command line options listed
- in the Options section above. If run outside of Linux containers,
- these arguments are parsed from <filename>/proc/cmdline</filename>
- instead.</para></footnote>:</para>
+ <para>When run as the system instance systemd parses a number of options listed below. They can be
+ specified as kernel command line arguments<footnote><para>If run inside a Linux container these arguments
+ may be passed as command line arguments to systemd itself, next to any of the command line options listed
+ in the Options section above. If run outside of Linux containers, these arguments are parsed from
+ <filename>/proc/cmdline</filename> instead.</para></footnote>, or through the
+ <literal>SystemdOptions</literal> EFI variable (on EFI systems). The kernel command line has higher
+ priority. Following variables are understood:</para>
<variablelist class='kernel-commandline-options'>
<varlistentry>