]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: move checking default_dependencies into target_add_default_dependencies. (...
authoriplayinsun <iplayinsun@gmail.com>
Fri, 21 Apr 2017 09:00:47 +0000 (18:00 +0900)
committerLennart Poettering <lennart@poettering.net>
Fri, 21 Apr 2017 09:00:47 +0000 (11:00 +0200)
Almost units check default_dependencies within [unit]_add_default_dependencies
except target unit.

src/core/target.c

index ff0d764fb5b7f5d16fa6b223ae42530db8762b3a..2a58dd394d09861534854b322208a99fd88c197b 100644 (file)
@@ -63,6 +63,9 @@ static int target_add_default_dependencies(Target *t) {
 
         assert(t);
 
+        if (!UNIT(t)->default_dependencies)
+                return 0;
+
         /* 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
@@ -93,7 +96,7 @@ static int target_load(Unit *u) {
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED && u->default_dependencies) {
+        if (u->load_state == UNIT_LOADED) {
                 r = target_add_default_dependencies(t);
                 if (r < 0)
                         return r;