X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=66d2c6b69a749ed422c68456a16287f4c0ce3ecf;hb=5d5e98eb8c859d5a85fe6cd5e3cc433bd8a096ba;hp=76e291881c95c747634b34f0848da8d85de23787;hpb=5076f0ccfd36b67512d44fe355b80305ced7dcba;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 76e291881..66d2c6b69 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -114,6 +114,11 @@
two containers is complete and the containers will
share very few runtime objects except for the
underlying file system.
+
+ systemd-nspawn implements the
+ Container
+ Interface specification.
@@ -183,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.
@@ -227,9 +232,57 @@
CAP_SETUID, CAP_SYS_ADMIN,
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
- CAP_SYS_RESOURCE.
+ CAP_SYS_RESOURCE, CAP_SYS_BOOT.
+
+
+
+
+
+ Control whether the
+ container's journal shall be made
+ visible to the host system. If enabled
+ allows viewing the container's journal
+ files from the host (but not vice
+ versa). Takes one of
+ no,
+ host,
+ guest,
+ auto. If
+ 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
+ into the container at the same
+ 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
+ at the same location. If
+ auto (the default)
+ and the 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
+ guest or
+ host will link the
+ journal persistantly if further one
+ the default of auto
+ is used.
+
+
+
+ Equivalent to
+ .
+