diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-22 07:35:33 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-12 00:21:06 +0100 |
| commit | 58f88d929f2b46e9470eb468f4890c1d4e8f51b7 (patch) | |
| tree | a5d52c0fa3289ec91363fd0fee99b2c73ae3190f /src/core/main.c | |
| parent | basic/def: indentation (diff) | |
| download | systemd-58f88d929f2b46e9470eb468f4890c1d4e8f51b7.tar.xz systemd-58f88d929f2b46e9470eb468f4890c1d4e8f51b7.zip | |
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 '')
| -rw-r--r-- | src/core/main.c | 4 |
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. */ |