From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 22 Jan 2017 06:35:33 +0000 (-0500)
Subject: manager: fix handling of failure in initialization
X-Git-Tag: v233~59^2~23
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=58f88d929f2b46e9470eb468f4890c1d4e8f51b7;p=systemd%2F.git

manager: fix handling of failure in initialization

We would warn and continue after failure in manager_startup, but there's no
way we can continue. We must fail.
---

diff --git a/src/core/main.c b/src/core/main.c
index ad2ce1330e..3c6b18229c 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1830,8 +1830,10 @@ int main(int argc, char *argv[]) {
         before_startup = now(CLOCK_MONOTONIC);
 
         r = manager_startup(m, arg_serialization, fds);
-        if (r < 0)
+        if (r < 0) {
                 log_error_errno(r, "Failed to fully start up daemon: %m");
+                goto finish;
+        }
 
         /* This will close all file descriptors that were opened, but
          * not claimed by any unit. */