diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-01 17:16:39 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-16 18:08:54 +0200 |
| commit | 28f0aef4c7e85f15346d68dcd6a08592af7c1662 (patch) | |
| tree | 1f26052223ac0cadb9716cf2485cd969e2c86f4e /man | |
| parent | 53aa0d02add93d8c0afa2772609372a2040c162a (diff) | |
| download | systemd-28f0aef4c7e85f15346d68dcd6a08592af7c1662.tar.gz | |
man: document SystemdOptions variable
Diffstat (limited to 'man')
| -rw-r--r-- | man/kernel-command-line.xml | 9 | ||||
| -rw-r--r-- | man/systemd.xml | 14 |
2 files changed, 13 insertions, 10 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index f9408a028d..a79be5997d 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -27,9 +27,12 @@ <refsect1> <title>Description</title> - <para>The kernel, the initial RAM disk (initrd) and - basic userspace functionality may be configured at boot via - kernel command line arguments.</para> + <para>The kernel, the initial RAM disk (initrd) and basic userspace functionality may be configured at + boot via kernel command line arguments. In addition, various systemd tools look at the EFI variable + <literal>SystemdOptions</literal> (if available). Both sources are combined, but the kernel command line + has higher priority. Please note that <emphasis>the EFI variable is only used by systemd tools, and is + ignored by the kernel and other user space tools</emphasis>, so it is not a replacement for the kernel + command line.</para> <para>For command line parameters understood by the kernel, please see 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> |