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/socket.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/socket.c')
| -rw-r--r-- | src/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/socket.c b/src/socket.c index 2a5270f336..7c280e0067 100644 --- a/src/socket.c +++ b/src/socket.c @@ -296,7 +296,7 @@ static int socket_add_default_dependencies(Socket *s) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) return r; - return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int socket_load(Unit *u) { |