X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftarget.c;h=3522bf12168f9a702a8cb2c6add51ed4d1d1ed21;hp=c350d8fa195bc2844a5b392758bb642e281c06ac;hb=0ddf1d3aa5e96b752ad62be48f99d7850a3d8542;hpb=b2bb3dbed9607c440b1a9ccacc515e28136d39ae

diff --git a/src/target.c b/src/target.c
index c350d8fa1..3522bf121 100644
--- a/src/target.c
+++ b/src/target.c
@@ -57,25 +57,27 @@ static int target_add_default_dependencies(Target *t) {
         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 (!set_get(t->meta.dependencies[UNIT_BEFORE], other))
-                        if ((r = unit_add_dependency(UNIT(t), UNIT_AFTER, other, true)) < 0)
-                                return r;
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 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;
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 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;
+                if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
+                    return r;
 
-        return 0;
+        /* Make sure targets are unloaded on shutdown */
+        return unit_add_dependency_by_name(UNIT(t), UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
 }
 
 static int target_add_getty_dependencies(Target *t) {