Annotation of /trunk/systemd/patches/systemd-217-units-make-systemd-journald.service-Type-notify.patch
Parent Directory | Revision Log
Revision 2524 -
(hide annotations)
(download)
Mon Nov 17 13:56:31 2014 UTC (9 years, 10 months ago) by niro
File size: 1220 byte(s)
Mon Nov 17 13:56:31 2014 UTC (9 years, 10 months ago) by niro
File size: 1220 byte(s)
-upstream fixes
1 | niro | 2524 | From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001 |
2 | From: Michal Schmidt <mschmidt@redhat.com> | ||
3 | Date: Tue, 4 Nov 2014 20:28:08 +0100 | ||
4 | Subject: [PATCH] units: make systemd-journald.service Type=notify | ||
5 | |||
6 | It already calls sd_notify(), so it looks like an oversight. | ||
7 | |||
8 | Without it, its ordering to systemd-journal-flush.service is | ||
9 | non-deterministic and the SIGUSR1 from flushing may kill journald before | ||
10 | it has its signal handlers set up. | ||
11 | |||
12 | https://bugs.freedesktop.org/show_bug.cgi?id=85871 | ||
13 | https://bugzilla.redhat.com/show_bug.cgi?id=1159641 | ||
14 | --- | ||
15 | (foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to | ||
16 | apply to systemd 217) | ||
17 | |||
18 | units/systemd-journald.service.in | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in | ||
22 | index 7ee67fd..8d380c8 100644 | ||
23 | --- a/units/systemd-journald.service.in | ||
24 | +++ b/units/systemd-journald.service.in | ||
25 | @@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a | ||
26 | Before=sysinit.target | ||
27 | |||
28 | [Service] | ||
29 | +Type=notify | ||
30 | Sockets=systemd-journald.socket systemd-journald-dev-log.socket | ||
31 | ExecStart=@rootlibexecdir@/systemd-journald | ||
32 | Restart=always | ||
33 | -- | ||
34 | 2.1.3 | ||
35 |