diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-08-09 22:32:30 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-08-09 22:32:30 +0200 |
commit | 69dd2852bb2c433b517d89792adb4461a4178aa1 (patch) | |
tree | f303fd9de62719c117a68c336bac5999ead3a3af /src/systemctl.c | |
parent | 6e98720f14dc25ee1d43f951d5c4d79b04ad7506 (diff) |
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.
Diffstat (limited to 'src/systemctl.c')
-rw-r--r-- | src/systemctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/systemctl.c b/src/systemctl.c index 27e5e3708e..e49c5b8671 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -311,6 +311,7 @@ static int dot_one_property(const char *name, const char *prop, DBusMessageIter "RequisiteOverridable", "[color=\"darkblue\"]", "Wants", "[color=\"darkgrey\"]", "Conflicts", "[color=\"red\"]", + "ConflictedBy", "[color=\"red\"]", "After", "[color=\"green\"]" }; |