X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd-nspawn.xml;h=db2d417e49f83110d31a25ab741fdedb93668970;hb=74051b9b5865586bf4d30b9075649af838fb92bd;hp=b6f2c278dade05adf246d682cc58828197e08318;hpb=9980033377c105d2cd6539c9d73ee61d4c2263b0;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index b6f2c278d..db2d417e4 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -138,6 +138,13 @@
text and exits.
+
+
+
+ Prints a version string
+ and exits.
+
+
@@ -188,7 +195,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.
@@ -220,7 +227,7 @@
list of capability names, see
capabilities7
for more information. Note that the
- the following capabilities will be
+ following capabilities will be
granted in any way: CAP_CHOWN,
CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
@@ -232,9 +239,56 @@
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
+ /var/log/journal/<machine-id>)
+ and the subdirectory is bind-mounted
+ into the container at the same
+ location. If guest,
+ the journal files are stored on the
+ 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 right subdirectory of
+ /var/log/journal
+ 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 persistently if further on
+ the default of auto
+ is used.
+
+
+
+ Equivalent to
+ .
+