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/path.c | |
| parent | service: hide output of sysv scripts if quiet is passed on the kernel cmdline (diff) | |
| download | systemd-69dd2852bb2c433b517d89792adb4461a4178aa1.tar.xz systemd-69dd2852bb2c433b517d89792adb4461a4178aa1.zip | |
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/path.c')
| -rw-r--r-- | src/path.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/path.c b/src/path.c index f4c20940d0..91de56f34c 100644 --- a/src/path.c +++ b/src/path.c @@ -110,7 +110,7 @@ static int path_add_default_dependencies(Path *p) { if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) return r; - return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int path_load(Unit *u) { |