From 9ea9a0c85c427397e1f1f4bb1f4d3192aab5987e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 13 Apr 2010 04:51:38 +0200 Subject: [PATCH] unit: allow state change from running to restarting --- service.c | 3 ++- unit.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/service.c b/service.c index 21e84366..ddf03bbf 100644 --- a/service.c +++ b/service.c @@ -1461,11 +1461,12 @@ static void service_enter_restart(Service *s) { int r; assert(s); + service_enter_dead(s, true, false); + if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0) goto fail; log_debug("%s scheduled restart job.", unit_id(UNIT(s))); - service_enter_dead(s, true, false); return; fail: diff --git a/unit.c b/unit.c index 7d570056..30ffd963 100644 --- a/unit.c +++ b/unit.c @@ -850,8 +850,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { assert(u); assert(os < _UNIT_ACTIVE_STATE_MAX); assert(ns < _UNIT_ACTIVE_STATE_MAX); - assert(!(os == UNIT_ACTIVE && ns == UNIT_ACTIVATING)); - assert(!(os == UNIT_INACTIVE && ns == UNIT_DEACTIVATING)); /* Note that this is called for all low-level state changes, * even if they might map to the same high-level -- 2.39.5