From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 9 Oct 2018 15:56:54 +0000 (+0200)
Subject: core: try to recover from failed reloads
X-Git-Tag: v240~585^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a35fa24ffdd3af167cb6d6b88bd73869c6d35b7;p=thirdparty%2Fsystemd.git

core: try to recover from failed reloads

Let's simply continue with everything we loaded, in the hope it's
somewhat useful.
---

diff --git a/src/core/main.c b/src/core/main.c
index 2810e881098..9bc5b3c6dc1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1698,7 +1698,11 @@ static int invoke_main_loop(
                         if (saved_log_target >= 0)
                                 manager_override_log_target(m, saved_log_target);
 
-                        (void) manager_reload(m);
+                        r = manager_reload(m);
+                        if (r < 0)
+                                /* Reloading failed before the point of no return. Let's continue running as if nothing happened. */
+                                m->objective = MANAGER_OK;
+
                         break;
                 }