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/automount.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/automount.c')
-rw-r--r-- | src/automount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/automount.c b/src/automount.c index da66630fd6..462f3170ba 100644 --- a/src/automount.c +++ b/src/automount.c @@ -154,7 +154,7 @@ static int automount_add_default_dependencies(Automount *a) { if (a->meta.manager->running_as == MANAGER_SYSTEM) { - if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; } |