X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=0c6fb002891d63e2cdbaed074d46915deff07e0f;hp=d7d60e52c24b6d685348fb7655a8725a7a93b6dc;hb=c4a5ddc9f29cf910fac9d814cd898b4cc2bd79b1;hpb=b9ba4dabbab8a58a044ec42655e11e65bd3ecc47
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index d7d60e52c..0c6fb0028 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -171,7 +171,7 @@
, nor
is specified
the directory is determined as
- /var/lib/container/
+ /var/lib/machines/
suffixed by the machine name as
specified with
. If
@@ -247,10 +247,13 @@
the root directory for the container
from. Takes a path to a regular file
or to a block device node. The file or
- block device must contain a GUID
- Partition Table with a root partition
- which is mounted as the root directory
- of the container. Optionally, it may
+ block device must contain either an
+ MBR partition table with a single
+ partition of type 0x83 that is marked
+ bootable, or a GUID partition table
+ with a root partition which is mounted
+ as the root directory of the
+ container. Optionally, GPT images may
contain a home and/or a server data
partition which are mounted to the
appropriate places in the
@@ -407,6 +410,7 @@
+ Create a virtual
@@ -442,6 +446,32 @@
of ve-.
+
+
+
+
+ If private networking
+ is enabled, maps an IP port on the
+ host onto an IP port on the
+ container. Takes a protocol specifier
+ (either tcp or
+ udp), separated by
+ a colon from a host port number in the
+ range 1 to 65535, separated by a colon
+ from a container port number in the
+ range from 1 to 65535. The protocol
+ specifier and its separating colon may
+ be omitted, in which case
+ tcp is assumed.
+ The container port number and its
+ colon may be ommitted, in which case
+ the same port as the host port is
+ implied. This option is only supported
+ if private networking is used, such as
+ or
+ .
+
+
@@ -535,7 +565,7 @@
at the same location. try-host
and try-guest do the same
but do not fail if the host does not have
- persistant journalling enabled.
+ persistent journalling enabled.
If auto (the default),
and the right subdirectory of
/var/log/journal
@@ -780,7 +810,7 @@
Boot a minimal Fedora distribution in a container
- # yum -y --releasever=19 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
+ # yum -y --releasever=21 --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
@@ -815,7 +845,7 @@
Enable Arch Linux container on boot
- # mv ~/arch-tree /var/lib/container/arch
+ # mv ~/arch-tree /var/lib/machines/arch
# systemctl enable systemd-nspawn@arch.service
# systemctl start systemd-nspawn@arch.service