chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: add Arch welcome message
[elogind.git]
/
src
/
job.c
diff --git
a/src/job.c
b/src/job.c
index 5d4a092345e9aee79d923a3dc44f0c3a64128d6a..7b20987c4adec8e8361003098f239dedc6e1d1cd 100644
(file)
--- a/
src/job.c
+++ b/
src/job.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-271,7
+271,7
@@
bool job_type_is_redundant(JobType a, UnitActiveState b) {
case JOB_STOP:
return
b == UNIT_INACTIVE ||
case JOB_STOP:
return
b == UNIT_INACTIVE ||
- b == UNIT_
MAINTENANCE
;
+ b == UNIT_
FAILED
;
case JOB_VERIFY_ACTIVE:
return
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);
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
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);
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;
r = -ENOEXEC;
else if (t == UNIT_ACTIVATING) {
j->type = JOB_START;