summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-11 17:15:38 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-11 17:16:08 +0100
commit89f7c8465cd1ab37347dd0c15920bce31e8225df (patch)
tree2db96d4cc6b4ee0e81c420b480b6c177228e38b3 /man
parent2d2ebd6b8f0775b93480bf05464865a0c78a9390 (diff)
machined: optionally, allow registration of pre-existing units (scopes
or services) as machine with machined
Diffstat (limited to 'man')
-rw-r--r--man/systemd-nspawn.xml28
1 files changed, 26 insertions, 2 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 47c3183eee..9d8db83e81 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -465,8 +465,8 @@
should be enabled when the container
runs a full Operating System (more
specifically: an init system), and is
- useful to ensure the container is
- accesible via
+ useful to ensure that the container is
+ accessible via
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
and shown by tools such as
<citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>. If
@@ -478,6 +478,30 @@
<option>--register=no</option>.
</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>--keep-unit</option></term>
+
+ <listitem><para>Instead of creating a
+ transient scope unit to run the
+ container in, simply register the
+ service or scope unit
+ <command>systemd-nspawn</command> has
+ been invoked in in
+ <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>. This
+ has no effect if
+ <option>--register=no</option> is
+ used. This switch should be used if
+ <command>systemd-nspawn</command> is
+ invoked from within an a service unit,
+ and the service unit's sole purpose
+ is to run a single
+ <command>systemd-nspawn</command>
+ container. This option is not
+ available if run from a user
+ session.</para></listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>