X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=777e0a3a77ba0ead624e29111ade46477892c9da;hb=0028da22f194f7c0ca7169a48cf32e1bc0f9138a;hp=1688687948ec3770ddd5727ab709a65b7fb4f301;hpb=b2e6df73aa508cc09b1b536a2fb9f90f152b89fa;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 168868794..777e0a3a7 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -138,6 +138,13 @@
text and exits.
+
+
+
+ Prints a version string
+ and exits.
+
+
@@ -220,8 +227,8 @@
list of capability names, see
capabilities7
for more information. Note that the
- the following capabilities will be
- granted in any way: CAP_CHOWN,
+ following capabilities will be granted
+ in any way: CAP_CHOWN,
CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
CAP_KILL, CAP_LEASE,
@@ -232,7 +239,9 @@
CAP_SETUID, CAP_SYS_ADMIN,
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
- CAP_SYS_RESOURCE, CAP_SYS_BOOT.
+ CAP_SYS_RESOURCE, CAP_SYS_BOOT,
+ CAP_AUDIT_WRITE,
+ CAP_AUDIT_CONTROL.
@@ -248,31 +257,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 persistently if further one
+ journal persistently if further on
the default of auto
is used.
@@ -290,13 +298,13 @@
Example 1
- # yum --releasever=17 --nogpgcheck --installroot ~/fedora-tree/ install yum passwd vim-minimal rootfiles systemd
-# systemd-nspawn -D ~/fedora-tree /usr/lib/systemd/systemd
+ # yum -y --releasever=19 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
+# systemd-nspawn -bD /srv/mycontainerThis installs a minimal Fedora distribution into
- the directory ~/fedora-tree/
- and then boots an OS in a namespace container in it,
- with systemd as init system.
+ the directory /srv/mycontainer/ and
+ then boots an OS in a namespace container in
+ it.