X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=75db65eac02340edd554d427c6dad2b2aea5ed66;hb=38ce47e262fbb76b6f6514e8e80cacfc584bee5a;hp=4aa97b02e79148a0473aeca6507df3d42a094553;hpb=0b3b83e59b637660524e90a07f9ef691856b19bf;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 4aa97b02e..75db65eac 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -106,7 +106,7 @@
yum8,
debootstrap8,
or
- pacman8
+ pacman8
to set up an OS directory tree suitable as file system
hierarchy for systemd-nspawn
containers.
@@ -439,7 +439,9 @@
versa). Takes one of
no,
host,
+ try-host,
guest,
+ try-guest,
auto. If
no, the journal is
not linked. If host,
@@ -453,8 +455,11 @@
guest file system (beneath
/var/log/journal/machine-id)
and the subdirectory is symlinked into the host
- at the same location. If
- auto (the default),
+ at the same location. try-host
+ and try-guest do the same
+ but do not fail if the host does not have
+ persistant journalling enabled.
+ If auto (the default),
and the right subdirectory of
/var/log/journal
exists, it will be bind mounted
@@ -473,7 +478,7 @@
Equivalent to
- .
+ .
@@ -774,7 +779,7 @@
chroot1,
yum8,
debootstrap8,
- pacman8,
+ pacman8,
systemd.slice5,
machinectl1