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/automount.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/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 57d1065049..9843481a61 100644 --- a/src/automount.c +++ b/src/automount.c @@ -156,7 +156,7 @@ static int automount_add_default_dependencies(Automount *a) { if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0) return r; - if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; } |