From b0693d30863a36da63d2a2732aa298fff6d34d0d Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Fri, 9 Aug 2013 12:54:10 +0200 Subject: [PATCH] service: prohibit Restart= set when Type=oneshot --- TODO | 2 -- src/core/service.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index ead699cd1..60622f7c7 100644 --- a/TODO +++ b/TODO @@ -88,8 +88,6 @@ Features: full, make sure to write how many messages are lost as first thing to syslog when it works again. -* prohibit Restart= set with Type=oneshot - * man: the documentation of Restart= currently is very misleading and suggests the tools from ExecStartPre= might get restarted. * load .d/*.conf dropins for device units diff --git a/src/core/service.c b/src/core/service.c index df49ce185..4070fd741 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1113,6 +1113,12 @@ static int service_verify(Service *s) { return -EINVAL; } + if (s->type == SERVICE_ONESHOT && s->restart != SERVICE_RESTART_NO) { + log_error_unit(UNIT(s)->id, + "%s has Restart setting other than no, which isn't allowed for Type=oneshot services. Refusing.", UNIT(s)->id); + return -EINVAL; + } + if (s->type == SERVICE_DBUS && !s->bus_name) { log_error_unit(UNIT(s)->id, "%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id); -- 2.30.2