X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjob.c;h=7b20987c4adec8e8361003098f239dedc6e1d1cd;hp=98c94e43b013155540bce25da9affd226a9a104b;hb=d2f316345cfadd07025b1a1770f63804e33c4b50;hpb=d6c9574fb558d9e304699b1cc7522c3b133adfc9 diff --git a/src/job.c b/src/job.c index 98c94e43b..7b20987c4 100644 --- a/src/job.c +++ b/src/job.c @@ -271,7 +271,7 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { case JOB_STOP: return b == UNIT_INACTIVE || - b == UNIT_MAINTENANCE; + b == UNIT_FAILED; case JOB_VERIFY_ACTIVE: return @@ -417,7 +417,7 @@ int job_run_and_invalidate(Job *j) { case JOB_RESTART: { UnitActiveState t = unit_active_state(j->unit); - if (t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_ACTIVATING) { + if (t == UNIT_INACTIVE || t == UNIT_FAILED || t == UNIT_ACTIVATING) { j->type = JOB_START; r = unit_start(j->unit); } else @@ -427,7 +427,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_MAINTENANCE || t == UNIT_DEACTIVATING) + if (t == UNIT_INACTIVE || t == UNIT_FAILED || t == UNIT_DEACTIVATING) r = -ENOEXEC; else if (t == UNIT_ACTIVATING) { j->type = JOB_START;