systemd: Patch systemd-journald.service to be Type=notify
https://bugs.freedesktop.org/show_bug.cgi?id=85871 https://bugzilla.redhat.com/show_bug.cgi?id=1159641
This commit is contained in:
parent
11aa16d2a6
commit
1d30b4aabd
|
@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
|
||||||
[ # These are all changes between upstream and
|
[ # These are all changes between upstream and
|
||||||
# https://github.com/edolstra/systemd/tree/nixos-v216.
|
# https://github.com/edolstra/systemd/tree/nixos-v216.
|
||||||
./fixes.patch
|
./fixes.patch
|
||||||
|
# Fixes systemd-journald so that it does not get killed
|
||||||
|
# by systemd-journal-flush starting too quickly
|
||||||
|
./systemd-journald-type-notify.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michal Schmidt <mschmidt@redhat.com>
|
||||||
|
Date: Tue, 4 Nov 2014 20:28:08 +0100
|
||||||
|
Subject: [PATCH] units: make systemd-journald.service Type=notify
|
||||||
|
|
||||||
|
It already calls sd_notify(), so it looks like an oversight.
|
||||||
|
|
||||||
|
Without it, its ordering to systemd-journal-flush.service is
|
||||||
|
non-deterministic and the SIGUSR1 from flushing may kill journald before
|
||||||
|
it has its signal handlers set up.
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=85871
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1159641
|
||||||
|
---
|
||||||
|
(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to
|
||||||
|
apply to systemd 217)
|
||||||
|
|
||||||
|
units/systemd-journald.service.in | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
|
||||||
|
index 7ee67fd..8d380c8 100644
|
||||||
|
--- a/units/systemd-journald.service.in
|
||||||
|
+++ b/units/systemd-journald.service.in
|
||||||
|
@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a
|
||||||
|
Before=sysinit.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
+Type=notify
|
||||||
|
Sockets=systemd-journald.socket systemd-journald-dev-log.socket
|
||||||
|
ExecStart=@rootlibexecdir@/systemd-journald
|
||||||
|
Restart=always
|
||||||
|
--
|
||||||
|
2.1.3
|
||||||
|
|
Loading…
Reference in a new issue