From 6124958c7bda3fed9b079e8217781480797703f5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 1 Jul 2010 00:31:53 +0200 Subject: unit: add new abstracted maintenance state for units --- src/job.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/job.c') diff --git a/src/job.c b/src/job.c index 78fe136328..8273a39c35 100644 --- a/src/job.c +++ b/src/job.c @@ -279,7 +279,8 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { case JOB_STOP: return - b == UNIT_INACTIVE; + b == UNIT_INACTIVE || + b == UNIT_INACTIVE_MAINTENANCE; case JOB_VERIFY_ACTIVE: return @@ -415,7 +416,7 @@ int job_run_and_invalidate(Job *j) { case JOB_RESTART: { UnitActiveState t = unit_active_state(j->unit); - if (t == UNIT_INACTIVE || t == UNIT_ACTIVATING) { + if (t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_ACTIVATING) { j->type = JOB_START; r = unit_start(j->unit); } else @@ -425,7 +426,7 @@ int job_run_and_invalidate(Job *j) { case JOB_TRY_RESTART: { UnitActiveState t = unit_active_state(j->unit); - if (t == UNIT_INACTIVE || t == UNIT_DEACTIVATING) + if (t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING) r = -ENOEXEC; else if (t == UNIT_ACTIVATING) { j->type = JOB_START; -- cgit v1.2.3-54-g00ecf