189e99161d
- Merge migration rpm macros into service_add/service_del macros. - Use systemd presets in rpm macros - Add fix-reload.patch: handle daemon-reload and start condition properly (bnc#719221). OBS-URL: https://build.opensuse.org/request/show/84932 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=71
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From a82e5507a6e03766957d43ca8818112ae9766288 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Thu, 22 Sep 2011 21:32:18 +0200
|
|
Subject: [PATCH] unit: don't recheck conditions when a unit is already starting but unit_start() is invoked
|
|
|
|
---
|
|
src/unit.c | 16 ++++++++++------
|
|
1 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/unit.c b/src/unit.c
|
|
index 3ce87ea..0b435cb 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;
|
|
}
|
|
--
|
|
1.7.3.4
|
|
|