core: if the start command vanishes during runtime don't hit an assert
authorLennart Poettering <lennart@poettering.net>
Fri, 21 Oct 2016 10:27:46 +0000 (12:27 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 21 Oct 2016 10:27:46 +0000 (12:27 +0200)
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

src/core/service.c

index f9127d7..53c2698 100644 (file)
@@ -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;
         }