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/service.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/service.c')
| -rw-r--r-- | src/service.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/service.c b/src/service.c index 49bdae7258..d3c750e544 100644 --- a/src/service.c +++ b/src/service.c @@ -1021,7 +1021,7 @@ static int service_add_default_dependencies(Service *s) { } /* Second, activate normal shutdown */ - return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int service_load(Unit *u) { @@ -3017,7 +3017,7 @@ static int service_enumerate(Manager *m) { if (service->meta.fragment_path) continue; - if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(service, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) goto finish; } |