From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Oct 2015 14:22:22 +0000 (+0200)
Subject: core: log if the service to activate vanished before we activate it
X-Git-Tag: v228~205^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995c5e96cdf9e6054a4df04960253d897f4d7cc2;p=thirdparty%2Fsystemd.git

core: log if the service to activate vanished before we activate it

Normally this shouldn't happen unless the daemon is reloaded.

A similar check is already in place in socket.c for the socket
activation case.

This hopefully makes #1526 non-fatal, though it will not fix this, and
there's something else to fix.
---

diff --git a/src/core/busname.c b/src/core/busname.c
index 38becfc1195..b85fce5f8df 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -585,6 +585,12 @@ static void busname_enter_running(BusName *n) {
                 }
 
         if (!pending) {
+                if (!UNIT_ISSET(n->service)) {
+                        log_unit_error(UNIT(n), "Service to activate vanished, refusing activation.");
+                        r = -ENOENT;
+                        goto fail;
+                }
+
                 r = manager_add_job(UNIT(n)->manager, JOB_START, UNIT_DEREF(n->service), JOB_REPLACE, true, &error, NULL);
                 if (r < 0)
                         goto fail;