summaryrefslogtreecommitdiffstats
path: root/man/systemd-nspawn.xml
diff options
context:
space:
mode:
authorIvan Shapovalov <intelfx@intelfx.name>2024-01-20 12:52:28 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-02-02 19:03:41 +0100
commit00fcd79e65305a0d2657312b001467a055b04801 (patch)
tree29b83cc46e59ef2951b2a9e8fe31a81b35609ec2 /man/systemd-nspawn.xml
parentcryptenroll: allow to use a public key on a token (diff)
downloadsystemd-00fcd79e65305a0d2657312b001467a055b04801.tar.xz
systemd-00fcd79e65305a0d2657312b001467a055b04801.zip
nspawn: permit --ephemeral with --link-journal=try-* (treat as =no)
Common sense says that to "try" something means "to not fail if something turns out not to be possible", thus do not make this combination a hard error. The actual implementation ignores any --link-journal= setting when --ephemeral is in effect, so the semantics are upheld.
Diffstat (limited to 'man/systemd-nspawn.xml')
-rw-r--r--man/systemd-nspawn.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 59b2c1a2d0..dc4a69f729 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1439,7 +1439,8 @@ After=sys-subsystem-net-devices-ens1.device</programlisting>
and the subdirectory is symlinked into the host at the same
location. <literal>try-host</literal> and
<literal>try-guest</literal> do the same but do not fail if
- the host does not have persistent journaling enabled. If
+ the host does not have persistent journaling enabled, or if
+ the container is in the <option>--ephemeral</option> mode. If
<literal>auto</literal> (the default), and the right
subdirectory of <filename>/var/log/journal</filename> exists,
it will be bind mounted into the container. If the