Merge pull request #14527 from poettering/socket-state-fix

core: propagate service state to socket in more load states
2020-01-09 17:10:48 -08:00 · 2020-01-09 11:53:26 +01:00
1 changed files with 6 additions and 1 deletions
--- a/src/core/socket.c
+++ b/src/core/socket.c
@ -3257,7 +3257,12 @@ static void socket_trigger_notify(Unit *u, Unit *other) {
        assert(other);

        /* Filter out invocations with bogus state */
-        if (other->load_state != UNIT_LOADED || other->type != UNIT_SERVICE)
+        if (!IN_SET(other->load_state,
+                    UNIT_LOADED,
+                    UNIT_NOT_FOUND,
+                    UNIT_BAD_SETTING,
+                    UNIT_ERROR,
+                    UNIT_MASKED) || other->type != UNIT_SERVICE)
                return;

        /* Don't propagate state changes from the service if we are already down */