summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2016-09-05 13:14:36 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-10-01 17:58:59 +0200
commit93a0884126146361ca078ec627da2cf766205a1c (patch)
tree1d9f827b88606fc1c0e56c5ab0725d084735e733 /man
parentc49b50113e1af56149e3dfbd96215c29b06eb4e8 (diff)
systemctl: Add --wait option to wait until started units terminate again
Fixes #3830
Diffstat (limited to 'man')
-rw-r--r--man/systemctl.xml15
1 files changed, 14 insertions, 1 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 0bf9e1fd3f..e738b5aecd 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -363,7 +363,20 @@
to finish. If this is not specified, the job will be
verified, enqueued and <command>systemctl</command> will
wait until the unit's start-up is completed. By passing this
- argument, it is only verified and enqueued.</para>
+ argument, it is only verified and enqueued. This option may not be
+ combined with <option>--wait</option>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--wait</option></term>
+
+ <listitem>
+ <para>Synchronously wait for started units to terminate again.
+ This option may not be combined with <option>--no-block</option>.
+ Note that this will wait forever if any given unit never terminates
+ (by itself or by getting stopped explicitly); particularly services
+ which use <literal>RemainAfterExit=yes</literal>.</para>
</listitem>
</varlistentry>