summaryrefslogtreecommitdiffstats
path: root/man/systemd.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-03-14 14:13:12 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-14 14:13:12 +0100
commit45dc3a0478c61e83dedf26dc247fd3ddd2b20978 (patch)
tree2bb3a319ab18f78226c147fece0dd4c25fb50b5a /man/systemd.xml
parentmachine-id: initialize from $container_uuid if not set otherwise (diff)
downloadsystemd-45dc3a0478c61e83dedf26dc247fd3ddd2b20978.tar.xz
systemd-45dc3a0478c61e83dedf26dc247fd3ddd2b20978.zip
man: document where we read kernel cmdline options from
Diffstat (limited to 'man/systemd.xml')
-rw-r--r--man/systemd.xml11
1 files changed, 10 insertions, 1 deletions
diff --git a/man/systemd.xml b/man/systemd.xml
index f0bc552268..aef65e30c1 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -957,7 +957,16 @@
<refsect1>
<title>Kernel Command Line</title>
- <para>When run as system instance systemd parses a few kernel command line arguments:</para>
+ <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>
<variablelist>
<varlistentry>