summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-09-13 12:06:49 +0200
committerLennart Poettering <lennart@poettering.net>2010-09-13 12:06:49 +0200
commit98bc20006d89aa8e7d9d3eeb75f475a66943fe55 (patch)
tree54673708bc001c8394a154ea311ba8f509561cd0 /src
parent34f0c1a118c68bbf8c6b57006c2acee2eedd1cbd (diff)
target: add default unit ordering deps from the unit not the target
Diffstat (limited to 'src')
-rw-r--r--src/target.c22
-rw-r--r--src/unit.c41
2 files changed, 42 insertions, 21 deletions
diff --git a/src/target.c b/src/target.c
index 1118693a39..f1f656e6dd 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);
diff --git a/src/unit.c b/src/unit.c
index 001d7659c4..d28a0a8cf7 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -725,6 +725,42 @@ int unit_load_fragment_and_dropin_optional(Unit *u) {
return 0;
}
+static int unit_add_one_default_dependency(Unit *u, Unit *target) {
+ assert(u);
+ assert(target);
+
+ if (target->meta.type != UNIT_TARGET)
+ return 0;
+
+ /* Don't create loops */
+ if (set_get(target->meta.dependencies[UNIT_BEFORE], u))
+ return 0;
+
+ return unit_add_dependency(target, UNIT_AFTER, u, true);
+}
+
+static int unit_add_default_dependencies(Unit *u) {
+ Unit *other;
+ Iterator i;
+ int r;
+
+ assert(u);
+
+ SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
+ if ((r = unit_add_one_default_dependency(u, other)) < 0)
+ return r;
+
+ SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
+ if ((r = unit_add_one_default_dependency(u, other)) < 0)
+ return r;
+
+ SET_FOREACH(other, u->meta.dependencies[UNIT_WANTED_BY], i)
+ if ((r = unit_add_one_default_dependency(u, other)) < 0)
+ return r;
+
+ return 0;
+}
+
int unit_load(Unit *u) {
int r;
@@ -750,6 +786,11 @@ int unit_load(Unit *u) {
goto fail;
}
+ if (u->meta.load_state == UNIT_LOADED &&
+ u->meta.default_dependencies)
+ if ((r = unit_add_default_dependencies(u)) < 0)
+ goto fail;
+
assert((u->meta.load_state != UNIT_MERGED) == !u->meta.merged_into);
unit_add_to_dbus_queue(unit_follow_merge(u));