summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-09-22 21:32:18 +0200
committerLennart Poettering <lennart@poettering.net>2011-09-22 21:32:18 +0200
commita82e5507a6e03766957d43ca8818112ae9766288 (patch)
tree225f1111d8912fd57b6fa99f5db3208a6afac202 /src
parent7712ea6da6833a9e6b5a2810eb8b94e527069e1b (diff)
unit: don't recheck conditions when a unit is already starting but unit_start() is invoked
Diffstat (limited to 'src')
-rw-r--r--src/unit.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/unit.c b/src/unit.c
index 3ce87ea1d3..0b435cb78e 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -888,16 +888,20 @@ int unit_start(Unit *u) {
if (u->meta.load_state != UNIT_LOADED)
return -EINVAL;
- /* If this is already (being) started, then this will
- * succeed. Note that this will even succeed if this unit is
- * not startable by the user. This is relied on to detect when
- * we need to wait for units and when waiting is finished. */
+ /* If this is already started, then this will succeed. Note
+ * that this will even succeed if this unit is not startable
+ * by the user. This is relied on to detect when we need to
+ * wait for units and when waiting is finished. */
state = unit_active_state(u);
if (UNIT_IS_ACTIVE_OR_RELOADING(state))
return -EALREADY;
- /* If the conditions failed, don't do anything at all */
- if (!unit_condition_test(u)) {
+ /* If the conditions failed, don't do anything at all. If we
+ * already are activating this call might still be useful to
+ * speed up activation in case there is some hold-off time,
+ * but we don't want to recheck the condition in that case. */
+ if (state != UNIT_ACTIVATING &&
+ !unit_condition_test(u)) {
log_debug("Starting of %s requested but condition failed. Ignoring.", u->meta.id);
return -EALREADY;
}