X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=71ce0aca438e1c581254156bd23bf74f687e1b1d;hb=fb0951b02ebf51a93acf12721d8857d31ce57ba3;hp=1f7d74e27322137db1079bb3f146fb0c403e4dbd;hpb=d87be9b0af81a6e07d4fb3028e45c4409100dc26;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1f7d74e27..71ce0aca4 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -188,7 +188,7 @@
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.
@@ -248,31 +248,30 @@
host,
guest,
auto. If
- no the journal is
- not linked. If host
+ no, the journal is
+ not linked. If host,
the journal files are stored on the
- host file system (beneath the host's
- /var/log/journal)
- and a per-machine subdirectory of this
- directory is created and bind mounted
+ host file system (beneath
+ /var/log/journal/<machine-id>)
+ and the subdirectory is bind-mounted
into the container at the same
- location. If guest
+ location. If guest,
the journal files are stored on the
- guest file system (beneath the guest's
- /var/log/journal)
- and a per-machine subdirectory of this
- directory is symlinked into the host
+ 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)
- and the subdirectory of
+ auto (the default),
+ and the right subdirectory of
/var/log/journal
- 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
guest or
host will link the
- journal persistantly if further one
+ journal persistently if further on
the default of auto
is used.