]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: try to recover from failed reloads
authorLennart Poettering <lennart@poettering.net>
Tue, 9 Oct 2018 15:56:54 +0000 (17:56 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 9 Oct 2018 17:43:43 +0000 (19:43 +0200)
Let's simply continue with everything we loaded, in the hope it's
somewhat useful.

src/core/main.c

index 2810e88109896fbc7e9682de4758c44127be2642..9bc5b3c6dc1301a7ca159afc53526ee3607339b6 100644 (file)
@@ -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;
                 }