shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-01 09:47:35 +03:00
Code

unit: make sure a job for a service of type 'finish' succeeds if the process terminates cleanly

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-11 04:02:58 +02:00
parent 6c073082e7
commit 41b02ec77e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/unit.c
View File

@ -1034,7 +1034,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
job_finish_and_invalidate(u->meta.job, true); job_finish_and_invalidate(u->meta.job, true);
else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) { else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
unexpected = true; unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
if (UNIT_IS_INACTIVE_OR_MAINTENANCE(ns))
job_finish_and_invalidate(u->meta.job, ns != UNIT_MAINTENANCE);
} }
break; break;
@ -1047,7 +1049,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
job_finish_and_invalidate(u->meta.job, true); job_finish_and_invalidate(u->meta.job, true);
else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) { else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
unexpected = true; unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
if (UNIT_IS_INACTIVE_OR_MAINTENANCE(ns))
job_finish_and_invalidate(u->meta.job, ns != UNIT_MAINTENANCE);
} }
} }
@ -1057,7 +1061,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
case JOB_RESTART: case JOB_RESTART:
case JOB_TRY_RESTART: case JOB_TRY_RESTART:
if (ns == UNIT_INACTIVE || ns == UNIT_MAINTENANCE) if (UNIT_IS_INACTIVE_OR_MAINTENANCE(ns))
job_finish_and_invalidate(u->meta.job, true); job_finish_and_invalidate(u->meta.job, true);
else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) { else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
unexpected = true; unexpected = true;