Skip to content

Commit e8c48ee

Browse files
committed
Revert "socket: fix socket activation of stopped services with pinned FD store"
The test does not work on older releases, so revert the change as we cannot validate it properly. This reverts commit 3888d11. (cherry picked from commit 3e30268)
1 parent 140269f commit e8c48ee

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

src/core/socket.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,7 +2495,7 @@ static int socket_start(Unit *u) {
24952495
/* If the service is already active we cannot start the
24962496
* socket */
24972497
if (!IN_SET(service->state,
2498-
SERVICE_DEAD, SERVICE_DEAD_BEFORE_AUTO_RESTART, SERVICE_DEAD_RESOURCES_PINNED, SERVICE_FAILED, SERVICE_FAILED_BEFORE_AUTO_RESTART,
2498+
SERVICE_DEAD, SERVICE_DEAD_BEFORE_AUTO_RESTART, SERVICE_FAILED, SERVICE_FAILED_BEFORE_AUTO_RESTART,
24992499
SERVICE_AUTO_RESTART, SERVICE_AUTO_RESTART_QUEUED))
25002500
return log_unit_error_errno(u, SYNTHETIC_ERRNO(EBUSY),
25012501
"Socket service %s already active, refusing.", UNIT(service)->id);
@@ -3360,7 +3360,7 @@ static void socket_trigger_notify(Unit *u, Unit *other) {
33603360
return;
33613361

33623362
if (IN_SET(SERVICE(other)->state,
3363-
SERVICE_DEAD, SERVICE_DEAD_BEFORE_AUTO_RESTART, SERVICE_DEAD_RESOURCES_PINNED, SERVICE_FAILED, SERVICE_FAILED_BEFORE_AUTO_RESTART,
3363+
SERVICE_DEAD, SERVICE_DEAD_BEFORE_AUTO_RESTART, SERVICE_FAILED, SERVICE_FAILED_BEFORE_AUTO_RESTART,
33643364
SERVICE_FINAL_SIGTERM, SERVICE_FINAL_SIGKILL,
33653365
SERVICE_AUTO_RESTART, SERVICE_AUTO_RESTART_QUEUED))
33663366
socket_enter_listening(s);

test/units/TEST-04-JOURNAL.stopped-socket-activation.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)