shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-06 21:49:53 +03:00
Code Activity

nspawn: correctly document the relationship of --keep-unit and --register=no (#7364)

Browse Source 
Fixes: #7228
This commit is contained in:
Lennart Poettering
2017-11-17 10:54:50 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent 1bdfc7b951
commit bb84995789
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
man/systemd-nspawn.xml
View File

@ -915,20 +915,17 @@
<varlistentry> <varlistentry>
<term><option>--keep-unit</option></term> <term><option>--keep-unit</option></term>
<listitem><para>Instead of creating a transient scope unit to <listitem><para>Instead of creating a transient scope unit to run the container in, simply use the service or
run the container in, simply register the service or scope scope unit <command>systemd-nspawn</command> has been invoked in. If <option>--register=yes</option> is set
unit <command>systemd-nspawn</command> has been invoked in this unit is registered with
with <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>. This
<citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>. switch should be used if <command>systemd-nspawn</command> is invoked from within a service unit, and the
This has no effect if <option>--register=no</option> is used. service unit's sole purpose is to run a single <command>systemd-nspawn</command> container. This option is not
This switch should be used if available if run from a user session.</para>
<command>systemd-nspawn</command> is invoked from within 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>
<para>Note that passing <option>--keep-unit</option> disables the effect of <option>--slice=</option> and <para>Note that passing <option>--keep-unit</option> disables the effect of <option>--slice=</option> and
<option>--property=</option>.</para></listitem> <option>--property=</option>. Use <option>--keep-unit</option> and <option>--register=no</option> in
combination to disable any kind of unit allocation or registration with
<command>systemd-machined</command>.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>