diff options
Diffstat (limited to 'src/core/path.c')
| -rw-r--r-- | src/core/path.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/core/path.c b/src/core/path.c index bcd922901b..1b0f115dd8 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -480,7 +480,7 @@ static void path_enter_dead(Path *p, PathResult f) { p->result = f; unit_log_result(UNIT(p), p->result == PATH_SUCCESS, path_result_to_string(p->result)); - path_set_state(p, p->result == PATH_SUCCESS ? PATH_DEAD : PATH_FAILED); + path_set_state(p, p->result != PATH_SUCCESS ? PATH_FAILED : PATH_DEAD); } static void path_enter_running(Path *p) { @@ -780,11 +780,6 @@ static void path_trigger_notify(Unit *u, Unit *other) { return; } - if (unit_has_failed_condition_or_assert(other)) { - path_enter_dead(p, PATH_FAILURE_UNIT_CONDITION_FAILED); - return; - } - /* Don't propagate anything if there's still a job queued */ if (other->job) return; @@ -837,11 +832,10 @@ static const char* const path_type_table[_PATH_TYPE_MAX] = { DEFINE_STRING_TABLE_LOOKUP(path_type, PathType); static const char* const path_result_table[_PATH_RESULT_MAX] = { - [PATH_SUCCESS] = "success", - [PATH_FAILURE_RESOURCES] = "resources", - [PATH_FAILURE_START_LIMIT_HIT] = "start-limit-hit", - [PATH_FAILURE_UNIT_START_LIMIT_HIT] = "unit-start-limit-hit", - [PATH_FAILURE_UNIT_CONDITION_FAILED] = "unit-condition-failed", + [PATH_SUCCESS] = "success", + [PATH_FAILURE_RESOURCES] = "resources", + [PATH_FAILURE_START_LIMIT_HIT] = "start-limit-hit", + [PATH_FAILURE_UNIT_START_LIMIT_HIT] = "unit-start-limit-hit", }; DEFINE_STRING_TABLE_LOOKUP(path_result, PathResult); |