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.
2010-08-09 22:32:30 +02:00
parent 6e98720f14
commit 69dd2852bb
17 changed files with 161 additions and 41 deletions
@@ -285,7 +285,7 @@ static int mount_add_default_dependencies(Mount *m) {
                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0)
                        return r;

-                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                        return r;
        }