diff options
author | Kevin Kuehler <keur@xcf.berkeley.edu> | 2019-11-01 01:47:37 -0700 |
---|---|---|
committer | Kevin Kuehler <keur@xcf.berkeley.edu> | 2019-11-05 11:17:56 -0800 |
commit | 132e0b532c9b7e7d3166f9d6100d94d395a91aed (patch) | |
tree | 6b156b4214a41a6de908044a75d991a9d2bebab2 | |
parent | 1f0f9f21c1b19e1e450c3c2696955fd6f442ca2b (diff) | |
download | systemd-132e0b532c9b7e7d3166f9d6100d94d395a91aed.tar.gz |
man: Document --job-mode=triggering switch
-rw-r--r-- | man/systemctl.xml | 12 | ||||
-rw-r--r-- | src/core/transaction.c | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index a519a2aec1..0e3b90b266 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1601,8 +1601,9 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err <literal>replace-irreversibly</literal>, <literal>isolate</literal>, <literal>ignore-dependencies</literal>, - <literal>ignore-requirements</literal> or - <literal>flush</literal>. Defaults to + <literal>ignore-requirements</literal>, + <literal>flush</literal>, or + <literal>triggering</literal>. Defaults to <literal>replace</literal>, except when the <command>isolate</command> command is used which implies the <literal>isolate</literal> job mode.</para> @@ -1647,6 +1648,13 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err dependencies will still be honored.</para> </listitem> + <para><literal>triggering</literal> may only be used with + <command>systemctl stop</command>. In this mode, the specified + unit and any active units that trigger it are stopped. See the + discussion of + <varname>Triggers=</varname> in <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for more information about triggering units.</para> + </varlistentry> <varlistentry> diff --git a/src/core/transaction.c b/src/core/transaction.c index 34647281a4..a0ea0f0489 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1148,6 +1148,7 @@ int transaction_add_triggering_jobs(Transaction *tr, Unit *u) { int r; assert(tr); + assert(u); HASHMAP_FOREACH_KEY(v, trigger, u->dependencies[UNIT_TRIGGERED_BY], i) { /* No need to stop inactive jobs */ |