From: Maciej Wereski <m.wereski@partner.samsung.com>
Date: Fri, 9 Aug 2013 10:54:10 +0000 (+0200)
Subject: service: prohibit Restart= set when Type=oneshot
X-Git-Tag: v207~162
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b0693d30863a36da63d2a2732aa298fff6d34d0d

service: prohibit Restart= set when Type=oneshot
---

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);