|
 |
17aa40 |
From f97c6d921fb6b3d7ba88e064b03d3dd767df9ba1 Mon Sep 17 00:00:00 2001
|
|
|
17aa40 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
17aa40 |
Date: Tue, 16 Oct 2018 15:07:42 +0200
|
|
|
17aa40 |
Subject: [PATCH] core: allow services with no commands but SuccessAction set
|
|
|
17aa40 |
|
|
|
17aa40 |
(cherry picked from commit 3f00d379fa6221a4570c8cd955afd9b661787db9)
|
|
|
17aa40 |
|
|
|
17aa40 |
Related: #1860899
|
|
|
17aa40 |
---
|
|
|
17aa40 |
src/core/service.c | 13 +++++++++----
|
|
|
17aa40 |
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
17aa40 |
|
|
|
17aa40 |
diff --git a/src/core/service.c b/src/core/service.c
|
|
|
17aa40 |
index 4da1c5accb..7969bbf071 100644
|
|
|
17aa40 |
--- a/src/core/service.c
|
|
|
17aa40 |
+++ b/src/core/service.c
|
|
|
17aa40 |
@@ -556,8 +556,13 @@ static int service_verify(Service *s) {
|
|
|
17aa40 |
}
|
|
|
17aa40 |
}
|
|
|
17aa40 |
|
|
|
17aa40 |
- if (!s->exec_command[SERVICE_EXEC_START] && !s->exec_command[SERVICE_EXEC_STOP]) {
|
|
|
17aa40 |
- log_unit_error(UNIT(s), "Service lacks both ExecStart= and ExecStop= setting. Refusing.");
|
|
|
17aa40 |
+ if (!s->exec_command[SERVICE_EXEC_START] && !s->exec_command[SERVICE_EXEC_STOP]
|
|
|
17aa40 |
+ && UNIT(s)->success_action == EMERGENCY_ACTION_NONE) {
|
|
|
17aa40 |
+ /* FailureAction= only makes sense if one of the start or stop commands is specified.
|
|
|
17aa40 |
+ * SuccessAction= will be executed unconditionally if no commands are specified. Hence,
|
|
|
17aa40 |
+ * either a command or SuccessAction= are required. */
|
|
|
17aa40 |
+
|
|
|
17aa40 |
+ log_unit_error(UNIT(s), "Service has no ExecStart=, ExecStop=, or SuccessAction=. Refusing.");
|
|
|
17aa40 |
return -ENOEXEC;
|
|
|
17aa40 |
}
|
|
|
17aa40 |
|
|
|
17aa40 |
@@ -566,8 +571,8 @@ static int service_verify(Service *s) {
|
|
|
17aa40 |
return -ENOEXEC;
|
|
|
17aa40 |
}
|
|
|
17aa40 |
|
|
|
17aa40 |
- if (!s->remain_after_exit && !s->exec_command[SERVICE_EXEC_START]) {
|
|
|
17aa40 |
- log_unit_error(UNIT(s), "Service has no ExecStart= setting, which is only allowed for RemainAfterExit=yes services. Refusing.");
|
|
|
17aa40 |
+ if (!s->remain_after_exit && !s->exec_command[SERVICE_EXEC_START] && UNIT(s)->success_action == EMERGENCY_ACTION_NONE) {
|
|
|
17aa40 |
+ log_unit_error(UNIT(s), "Service has no ExecStart= and no SuccessAction= settings and does not have RemainAfterExit=yes set. Refusing.");
|
|
|
17aa40 |
return -ENOEXEC;
|
|
|
17aa40 |
}
|
|
|
17aa40 |
|