summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-01-22 01:35:33 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-11 18:21:06 -0500
commit58f88d929f2b46e9470eb468f4890c1d4e8f51b7 (patch)
treea5d52c0fa3289ec91363fd0fee99b2c73ae3190f /src
parent3a7928957bc730d9b7edb5161e3f17060debdb63 (diff)
downloadsystemd-58f88d929f2b46e9470eb468f4890c1d4e8f51b7.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/core/main.c4
1 files changed, 3 insertions, 1 deletions
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. */