X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftarget.c;h=f322ce72757a28452c613f4be8421f7e944a8855;hp=f1f656e6dd0f2fc0d5c72e36e169a17cac9c1520;hb=53d3afa8ca2811093c482b0e14addd1aaa92fb67;hpb=98bc20006d89aa8e7d9d3eeb75f475a66943fe55

diff --git a/src/target.c b/src/target.c
index f1f656e6d..f322ce727 100644
--- a/src/target.c
+++ b/src/target.c
@@ -53,10 +53,31 @@ static void target_set_state(Target *t, TargetState state) {
 }
 
 static int target_add_default_dependencies(Target *t) {
+        Iterator i;
+        Unit *other;
+        int r;
+
         assert(t);
 
+        /* 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 ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
+                    return r;
+
+        SET_FOREACH(other, t->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
+                    return r;
+
+        SET_FOREACH(other, t->meta.dependencies[UNIT_WANTS], i)
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
+                    return r;
+
         /* Make sure targets are unloaded on shutdown */
-        return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+        return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
 }
 
 static int target_add_getty_dependencies(Target *t) {