diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-16 04:36:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-16 04:41:21 +0200 |
| commit | 7027ff61a34a12487712b382a061c654acc3a679 (patch) | |
| tree | 05e9374a566d6accdd962dd4dc6d7076b9304122 /man/systemd-nspawn.xml | |
| parent | cec4ead904978b07db2154c618eeb48d3102da66 (diff) | |
nspawn: introduce the new /machine/ tree in the cgroup tree and move containers there
Containers will now carry a label (normally derived from the root
directory name, but configurable by the user), and the container's root
cgroup is /machine/<label>. This label is called "machine name", and can
cover both containers and VMs (as soon as libvirt also makes use of
/machine/).
libsystemd-login can be used to query the machine name from a process.
This patch also includes numerous clean-ups for the cgroup code.
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 8adcd946b..4d60acb3e 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -203,6 +203,21 @@ </varlistentry> <varlistentry> + <term><option>-M</option></term> + <term><option>--machine=</option></term> + + <listitem><para>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.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>--uuid=</option></term> <listitem><para>Set the specified uuid |