diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-11-20 14:30:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-11-21 14:27:26 +0100 |
| commit | 574edc90066c3faeadcf4666928ed9b0ac409c75 (patch) | |
| tree | b5ea9f666f2ef3b366e7722c5a2aa97e4f92433f /man | |
| parent | 812bd1e6ab4c463507557f2bdbb8875fedd92ade (diff) | |
nspawn: Add try-{host,guest} journal link modes
--link-journal={host,guest} fail if the host does not have persistent
journalling enabled and /var/log/journal/ does not exist. Even worse, as there
is no stdout/err any more, there is no error message to point that out.
Introduce two new modes "try-host" and "try-guest" which don't fail in this
case, and instead just silently skip the guest journal setup.
Change -j to mean "try-guest" instead of "guest", and fix the wrong --help
output for it (it said "host" before).
Change systemd-nspawn@.service.in to use "try-guest" so that this unit works
with both persistent and non-persistent journals on the host without failing.
https://bugs.debian.org/770275
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-nspawn.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index b3a2d3285..75db65eac 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -439,7 +439,9 @@ versa). Takes one of <literal>no</literal>, <literal>host</literal>, + <literal>try-host</literal>, <literal>guest</literal>, + <literal>try-guest</literal>, <literal>auto</literal>. If <literal>no</literal>, the journal is not linked. If <literal>host</literal>, @@ -453,8 +455,11 @@ guest file system (beneath <filename>/var/log/journal/<replaceable>machine-id</replaceable></filename>) and the subdirectory is symlinked into the host - at the same location. If - <literal>auto</literal> (the default), + 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 + persistant journalling enabled. + If <literal>auto</literal> (the default), and the right subdirectory of <filename>/var/log/journal</filename> exists, it will be bind mounted @@ -473,7 +478,7 @@ <term><option>-j</option></term> <listitem><para>Equivalent to - <option>--link-journal=guest</option>.</para></listitem> + <option>--link-journal=try-guest</option>.</para></listitem> </varlistentry> <varlistentry> |