diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-10-29 01:15:18 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-10-29 16:28:27 +0200 |
commit | ead8e4788ee31bbdc38b4cd3c6e71c8a95bbc95a (patch) | |
tree | c990f3342cbaf0280890bbd73680f5a67fadcf48 /src/timer.c | |
parent | 9ed81015f0a426d98c2ad8f14d6f27a5058a726d (diff) |
unit: get rid of gnoreDependencyFailure= instead treat ConflictedBy= as weaker counterpart of Conflicts=, similar to Wants= vs. Requires=
Diffstat (limited to 'src/timer.c')
-rw-r--r-- | src/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timer.c b/src/timer.c index 627a360fe6..065e9c14db 100644 --- a/src/timer.c +++ b/src/timer.c @@ -82,7 +82,7 @@ static int timer_add_default_dependencies(Timer *t) { if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) return r; - return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int timer_load(Unit *u) { |