diff options
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 9f8b8e2ae4..fef5c2c83a 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -188,7 +188,7 @@ <term><option>-C</option></term> <listitem><para>Makes the container appear in - other hierarchies that the name=systemd:/ one. + other hierarchies than the name=systemd:/ one. Takes a comma-separated list of controllers. </para></listitem> </varlistentry> @@ -220,7 +220,7 @@ list of capability names, see <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more information. Note that the - the following capabilities will be + following capabilities will be granted in any way: CAP_CHOWN, CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH, CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER, @@ -232,7 +232,7 @@ CAP_SETUID, CAP_SYS_ADMIN, CAP_SYS_CHROOT, CAP_SYS_NICE, CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG, - CAP_SYS_RESOURCE.</para></listitem> + CAP_SYS_RESOURCE, CAP_SYS_BOOT.</para></listitem> </varlistentry> <varlistentry> @@ -248,31 +248,30 @@ <literal>host</literal>, <literal>guest</literal>, <literal>auto</literal>. If - <literal>no</literal> the journal is - not linked. If <literal>host</literal> + <literal>no</literal>, the journal is + not linked. If <literal>host</literal>, the journal files are stored on the - host file system (beneath the host's - <filename>/var/log/journal</filename>) - and a per-machine subdirectory of this - directory is created and bind mounted + host file system (beneath + <filename>/var/log/journal/<machine-id></filename>) + and the subdirectory is bind-mounted into the container at the same - location. If <literal>guest</literal> + location. If <literal>guest</literal>, the journal files are stored on the - guest file system (beneath the guest's - <filename>/var/log/journal</filename>) - and a per-machine subdirectory of this - directory is symlinked into the host + guest file system (beneath + <filename>/var/log/journal/<machine-id></filename>) + and the subdirectory is symlinked into the host at the same location. If - <literal>auto</literal> (the default) - and the subdirectory of + <literal>auto</literal> (the default), + and the right subdirectory of <filename>/var/log/journal</filename> - exists as directory it is bind mounted - into the container, but nothing is - done otherwise. Effectively, booting a - container once with + exists, it will be bind mounted + into the container. If the + subdirectory doesn't exist, no + linking is performed. Effectively, + booting a container once with <literal>guest</literal> or <literal>host</literal> will link the - journal persistantly if further one + journal persistently if further on the default of <literal>auto</literal> is used.</para></listitem> </varlistentry> |