X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=fef5c2c83a8151336b4069b5ed4f7e9873496f25;hb=f4443fa5976eca51661947dd4df60847213f27fa;hp=9f8b8e2ae46593ac2038b635e0bea8412c4af1b8;hpb=57fb9fb56db0584581ce33ee842dcbf5f1136856;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 9f8b8e2ae..fef5c2c83 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.
@@ -220,7 +220,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,7 +232,7 @@
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.
@@ -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.