X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftarget.c;fp=src%2Ftarget.c;h=f1f656e6dd0f2fc0d5c72e36e169a17cac9c1520;hp=1118693a3907bc698b3915fdee35a635f24b9235;hb=98bc20006d89aa8e7d9d3eeb75f475a66943fe55;hpb=34f0c1a118c68bbf8c6b57006c2acee2eedd1cbd diff --git a/src/target.c b/src/target.c index 1118693a3..f1f656e6d 100644 --- a/src/target.c +++ b/src/target.c @@ -53,27 +53,7 @@ static void target_set_state(Target *t, TargetState state) { } static int target_add_default_dependencies(Target *t) { - Iterator i; - Unit *other; - int r; - - /* Imply ordering for requirement dependencies on target - * units. Note that when the user created a contradicting - * ordering manually we won't add anything in here to make - * sure we don't create a loop. */ - - SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES], i) - if (!set_get(t->meta.dependencies[UNIT_BEFORE], other)) - if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0) - return r; - SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i) - if (!set_get(t->meta.dependencies[UNIT_BEFORE], other)) - if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0) - return r; - SET_FOREACH(other, t->meta.dependencies[UNIT_WANTS], i) - if (!set_get(t->meta.dependencies[UNIT_BEFORE], other)) - if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0) - return r; + assert(t); /* Make sure targets are unloaded on shutdown */ return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);