X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=fdb0c298b0aef7a37bd2ea49a579a47135afb70a;hb=b98b483bac585af754e8a22ea890db8486905d8a;hp=b66c34df01fea0dec00f6ef61b5dce04057f2f7f;hpb=ec16945ebfe64d5cd5403ae1a1b16bc05a779a16;p=elogind.git
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index b66c34df0..fdb0c298b 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -231,8 +231,10 @@
its root directory (as configured with
), that
is removed immediately when the
- container terminates. May not be
- specified together with
+ container terminates. This option is
+ only supported if the root file system
+ is btrfs. May not
+ be specified together with
or
.
@@ -303,13 +305,22 @@
Sets the machine name
for this container. This name may be
- used to identify this container on the
- host, and is used to initialize the
- container's hostname (which the
- container can choose to override,
- however). If not specified, the last
- component of the root directory of the
- container is used.
+ used to identify this container during
+ its runtime (for example in tools like
+ machinectl1
+ and similar), and is used to
+ initialize the container's hostname
+ (which the container can choose to
+ override, however). If not specified,
+ the last component of the root
+ directory path of the container is
+ used, possibly suffixed with a random
+ identifier in case
+ mode is
+ selected. If the root directory
+ selected is the host's root directory
+ the host's hostname is used as default
+ instead.
@@ -769,7 +780,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
@@ -814,13 +825,16 @@
- Boot into a btrfs snapshot of the host system
+ Boot into an ephemeral btrfs snapshot of the host system
- # btrfs subvolume snapshot / /.tmp
-# systemd-nspawn --private-network -D /.tmp -b
+ # systemd-nspawn -D / -xbThis runs a copy of the host system in a
- btrfs snapshot.
+ btrfs snapshot which is
+ removed immediately when the container
+ exits. All file system changes made during
+ runtime will be lost on shutdown,
+ hence.
@@ -847,7 +861,8 @@
debootstrap8,
pacman8,
systemd.slice5,
- machinectl1
+ machinectl1,
+ btrfs8