diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-02 10:10:44 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-02 10:10:44 +0100 |
| commit | d0744e54eb83a9f4e4f54a59de3905699a667be0 (patch) | |
| tree | 67deec65f866186503d4a45c1197121625b159cb /src/nspawn | |
| parent | 534e8f89d6367cd0e9e17fff67880fb430071d01 (diff) | |
| parent | 3958325852869a5e490b5741016c93b8b9a80e11 (diff) | |
Merge pull request #1745 from poettering/journal-deadlock
Make sure journald never blocks on sd_notify() to PID 1
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 44f08ab1b4..ff12ca6498 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3227,8 +3227,7 @@ int main(int argc, char *argv[]) { } for (;;) { - _cleanup_close_pair_ int kmsg_socket_pair[2] = { -1, -1 }, rtnl_socket_pair[2] = { -1, -1 }, pid_socket_pair[2] = { -1, -1 }, - uid_shift_socket_pair[2] = { -1, -1 }; + _cleanup_close_pair_ int kmsg_socket_pair[2] = { -1, -1 }, rtnl_socket_pair[2] = { -1, -1 }, pid_socket_pair[2] = { -1, -1 }, uid_shift_socket_pair[2] = { -1, -1 }; ContainerStatus container_status; _cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL; static const struct sigaction sa = { |