summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2014-11-20 14:30:52 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-21 14:27:26 +0100
commit574edc90066c3faeadcf4666928ed9b0ac409c75 (patch)
treeb5ea9f666f2ef3b366e7722c5a2aa97e4f92433f /units
parent812bd1e6ab4c463507557f2bdbb8875fedd92ade (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 'units')
-rw-r--r--units/systemd-nspawn@.service.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index dec2ce7df7..e3eaa53239 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -10,7 +10,7 @@ Description=Container %i
Documentation=man:systemd-nspawn(1)
[Service]
-ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --directory=/var/lib/container/%i
KillMode=mixed
Type=notify
RestartForceExitStatus=133