diff options
| -rw-r--r-- | src/job.c | 2 | ||||
| -rw-r--r-- | src/unit.c | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -484,7 +484,7 @@ int job_finish_and_invalidate(Job *j, bool success) { job_free(j); if (!success) - unit_status_printf(u, "Starting %s... " ANSI_HIGHLIGHT_ON "failed" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u)); + unit_status_printf(u, "Starting %s " ANSI_HIGHLIGHT_ON "failed" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u)); /* Fail depending jobs on failure */ if (!success) { diff --git a/src/unit.c b/src/unit.c index 701dbc0952..4810d2b9f4 100644 --- a/src/unit.c +++ b/src/unit.c @@ -1020,10 +1020,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { case JOB_RESTART: case JOB_TRY_RESTART: - if (ns == UNIT_INACTIVE) + if (ns == UNIT_INACTIVE || ns == UNIT_MAINTENANCE) job_finish_and_invalidate(u->meta.job, true); - else if (ns == UNIT_MAINTENANCE) - job_finish_and_invalidate(u->meta.job, false); else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) { unexpected = true; job_finish_and_invalidate(u->meta.job, false); |