[arch-commits] Commit in systemd/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, November 4, 2014 @ 21:31:36
  Author: foutrelis
Revision: 225621

upgpkg: systemd 217-5

Fix systemd-journal-flush.service hang at boot (FS#42678).

Added:
  systemd/trunk/0001-units-make-systemd-journald.service-Type-notify.patch
  systemd/trunk/0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
Modified:
  systemd/trunk/PKGBUILD

-------------------------------------------------------------+
 0001-units-make-systemd-journald.service-Type-notify.patch  |   35 ++++++++++
 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch |   29 ++++++++
 PKGBUILD                                                    |    8 ++
 3 files changed, 71 insertions(+), 1 deletion(-)

Added: 0001-units-make-systemd-journald.service-Type-notify.patch
===================================================================
--- 0001-units-make-systemd-journald.service-Type-notify.patch	                        (rev 0)
+++ 0001-units-make-systemd-journald.service-Type-notify.patch	2014-11-04 20:31:36 UTC (rev 225621)
@@ -0,0 +1,35 @@
+From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at 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
+

Added: 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
===================================================================
--- 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch	                        (rev 0)
+++ 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch	2014-11-04 20:31:36 UTC (rev 225621)
@@ -0,0 +1,29 @@
+From 1f1926aa5e836caa3bd6df43704aecd606135103 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Sun, 2 Nov 2014 21:45:42 -0500
+Subject: [PATCH] units: order sd-journal-flush after sd-remount-fs
+
+Otherwise we could attempt to flush the journal while /var/log/ was
+still ro, and silently skip journal flushing.
+
+The way that errors in flushing are handled should still be changed to
+be more transparent and robust.
+---
+ units/systemd-journal-flush.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
+index fa29089..98c91b4 100644
+--- a/units/systemd-journal-flush.service.in
++++ b/units/systemd-journal-flush.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+ DefaultDependencies=no
+ Requires=systemd-journald.service
+ After=systemd-journald.service
++After=systemd-remount-fs.service
+ Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
+ RequiresMountsFor=/var/log/journal
+ 
+-- 
+2.1.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-04 14:57:54 UTC (rev 225620)
+++ PKGBUILD	2014-11-04 20:31:36 UTC (rev 225621)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=217
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -18,6 +18,8 @@
         '0001-shared-install-avoid-prematurely-rejecting-missing-u.patch'
         '0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch'
         '0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch'
+        '0001-units-order-sd-journal-flush-after-sd-remount-fs.patch'
+        '0001-units-make-systemd-journald.service-Type-notify.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev')
@@ -27,6 +29,8 @@
          '7aaf44ce842deb449fca0f2595bbc1e4'
          '4adc3ddce027693bafa53089322e859b'
          '42ff9d59bb057637355b202157d59991'
+         '92497d06e0af615be4b368fe615109c0'
+         'a321d62d6ffada9e6976bdd339fa3219'
          '29245f7a240bfba66e2b1783b63b6b40'
          '455b68a9a15f634dcfdaff2463010d4e'
          'bde43090d4ac0ef048e3eaee8202a407')
@@ -40,6 +44,8 @@
   patch -Np1 <../0001-shared-install-avoid-prematurely-rejecting-missing-u.patch
   patch -Np1 <../0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch
   patch -Np1 <../0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch
+  patch -Np1 <../0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
+  patch -Np1 <../0001-units-make-systemd-journald.service-Type-notify.patch
 }
 
 build() {