From 69dd2852bb2c433b517d89792adb4461a4178aa1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 9 Aug 2010 22:32:30 +0200 Subject: manager: when two pending jobs conflict, keep the one that "conflicts", remove the one that is "conflicted" This gives the writer of units control which unit is kept and which is stopped when two units conflict. --- man/systemd.unit.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'man/systemd.unit.xml') diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 585145ab37..e5d5968ab2 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -336,7 +336,22 @@ independent of and orthogonal to the After= and Before= ordering - dependencies. + dependencies. + + If a unit A that conflicts with + a unit B is scheduled to be started at + the same time as B, the transaction + will either fail (in case both are + required part of the transaction) or + be modified to be fixed (in case one + or both jobs are not a required part + of the transaction). In the latter + case the job that is not the required + will be removed, or in case both are + not required the unit that conflicts + will be started and the unit that is + conflicted is + stopped. -- cgit v1.2.3-54-g00ecf