diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-01-28 19:11:30 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-01-28 19:11:30 -0500 |
| commit | 2bc968b74843c3dc654a223eae8222505036c6c7 (patch) | |
| tree | 797980331963fdb87e098d3f8e336a1b4bd2d289 /src/core/job.h | |
| parent | 9e83569d8ff219730912ecac441843b9531b079c (diff) | |
| parent | aabf5d42434082ae4e2d0c98d4705f58ee707567 (diff) | |
Merge pull request #2464 from poettering/reload-or-try-restart
Fix for #688
Diffstat (limited to 'src/core/job.h')
| -rw-r--r-- | src/core/job.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/job.h b/src/core/job.h index 118b24e5b7..52866fdc48 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -66,6 +66,9 @@ enum JobType { * Thus we never need to merge it with anything. */ JOB_TRY_RESTART = _JOB_TYPE_MAX_IN_TRANSACTION, /* if running, stop and then start */ + /* Similar to JOB_TRY_RESTART but collapses to JOB_RELOAD or JOB_NOP */ + JOB_TRY_RELOAD, + /* JOB_RELOAD_OR_START won't enter into a transaction and cannot result * from transaction merging (there's no way for JOB_RELOAD and * JOB_START to meet in one transaction). It can result from a merge |