SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "core: Propagate condition failed state to triggering units."

Browse Source 
This reverts commit 12ab94a1e4.
This commit is contained in:
Daan De Meyer
2021-12-17 19:39:29 +01:00
parent 415d7d774a
commit 40f41f34d4
13 changed files with 28 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/timer.c
+3 -9
View File
@@ -598,11 +598,6 @@ static void timer_enter_running(Timer *t) {
return;
}
if (unit_has_failed_condition_or_assert(trigger)) {
timer_enter_dead(t, TIMER_FAILURE_UNIT_CONDITION_FAILED);
return;
}
r = manager_add_job(UNIT(t)->manager, JOB_START, trigger, JOB_REPLACE, NULL, &error, NULL);
if (r < 0)
goto fail;
@@ -916,10 +911,9 @@ static const char* const timer_base_table[_TIMER_BASE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(timer_base, TimerBase);
static const char* const timer_result_table[_TIMER_RESULT_MAX] = {
[TIMER_SUCCESS] = "success",
[TIMER_FAILURE_RESOURCES] = "resources",
[TIMER_FAILURE_START_LIMIT_HIT] = "start-limit-hit",
[TIMER_FAILURE_UNIT_CONDITION_FAILED] = "unit-condition-failed",
[TIMER_SUCCESS] = "success",
[TIMER_FAILURE_RESOURCES] = "resources",
[TIMER_FAILURE_START_LIMIT_HIT] = "start-limit-hit",
};
DEFINE_STRING_TABLE_LOOKUP(timer_result, TimerResult);