From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Oct 2016 10:27:46 +0000 (+0200)
Subject: core: if the start command vanishes during runtime don't hit an assert
X-Git-Tag: v234~923^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47fffb3530af3e3ad4048570611685635fde062e;p=platform%2Fupstream%2Fsystemd.git

core: if the start command vanishes during runtime don't hit an assert

This can happen when the configuration is changed and reloaded while we are
executing a service. Let's not hit an assert in this case.

Fixes: #4444
---

diff --git a/src/core/service.c b/src/core/service.c
index f9127d7..53c2698 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1756,7 +1756,15 @@ static void service_enter_start(Service *s) {
         }
 
         if (!c) {
-                assert(s->type == SERVICE_ONESHOT);
+                if (s->type != SERVICE_ONESHOT) {
+                        /* There's no command line configured for the main command? Hmm, that is strange. This can only
+                         * happen if the configuration changes at runtime. In this case, let's enter a failure
+                         * state. */
+                        log_unit_error(UNIT(s), "There's no 'start' task anymore we could start: %m");
+                        r = -ENXIO;
+                        goto fail;
+                }
+
                 service_enter_start_post(s);
                 return;
         }