X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=b0f7aa37cb0b9f7e7ef297d4d950af7204e07d97;hb=78eb158a20e2bee772f6e49d8b432b98f68cbb55;hp=fdb0c298b0aef7a37bd2ea49a579a47135afb70a;hpb=667993e88eb7519c6674fe9a9e985619817465e0;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index fdb0c298b..b0f7aa37c 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,23 +247,43 @@
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
- contain a home and/or a server data
- partition which are mounted to the
- appropriate places in the
- container. All these partitions must
- be identified by the partition types
- defined by the Discoverable
- Partitions Specification. Any
- other partitions, such as foreign
- partitions, swap partitions or EFI
- system partitions are not mounted. May
- not be specified together with
- ,
+ block device must contain either:
+
+
+ An MBR
+ partition table with a single
+ partition of type 0x83 that is
+ marked
+ bootable.
+
+ A GUID
+ partition table (GPT) with a single
+ partition of type
+ 0fc63daf-8483-4772-8e79-3d69d8477de4.
+
+ A GUID
+ partition table (GPT) with a
+ marked 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
+ container. All these
+ partitions must be identified
+ by the partition types defined
+ by the Discoverable
+ Partitions
+ Specification.
+
+
+ Any other partitions, such as
+ foreign partitions, swap partitions or
+ EFI system partitions are not
+ mounted. May not be specified together
+ with ,
or
.
@@ -407,6 +427,31 @@
+
+
+ Create an
+ ipvlan interface
+ of the specified Ethernet network
+ interface and add it to the
+ container. An
+ ipvlan interface
+ is a virtual interface, similar to a
+ macvlan interface, which
+ uses the same MAC address as the underlying
+ interface. The interface
+ in the container will be named after
+ the interface on the host, prefixed
+ with iv-. Note that
+
+ implies
+ . This
+ option may be used more than once to
+ add multiple network interfaces to the
+ container.
+
+
+
+ Create a virtual
@@ -442,6 +487,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 +606,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
@@ -777,8 +848,18 @@
Examples
+
- Boot a minimal Fedora distribution in a container
+ Download a Fedora image and start a shell in it
+
+ # machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz
+# systemd-nspawn -M Fedora-Cloud-Base-20141203-21
+
+This downloads an image using machinectl1 and opens a shell in it.
+
+
+
+ Build and boot a minimal Fedora distribution in a container# yum -y --releasever=21 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
# systemd-nspawn -bD /srv/mycontainer
@@ -812,18 +893,6 @@
boots an OS in a namespace container in it.
-
- Enable Arch Linux container on boot
-
- # mv ~/arch-tree /var/lib/container/arch
-# systemctl enable systemd-nspawn@arch.service
-# systemctl start systemd-nspawn@arch.service
-
- This makes the Arch Linux container part of the
- multi-user.target on the host.
-
-
-
Boot into an ephemeral <literal>btrfs</literal> snapshot of the host system