From d66b3fca4f9e5f3371be5e524985cab891072fe1ad45cbdce377b8d4791a2bdc Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Tue, 31 Jan 2012 12:42:31 +0000
Subject: [PATCH] - Ensure systemd show service status when started behind
 bootsplash   (bnc#736225). - Disable core dump redirection to journal, not
 stable atm.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=237
---
 bootsplash-quit.service     |  1 +
 bootsplash-shutdown.service |  1 +
 bootsplash-startup.service  |  1 +
 systemd-gtk.changes         | 13 +++++++++++++
 systemd.changes             |  7 +++++++
 systemd.spec                |  7 ++++++-
 6 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/bootsplash-quit.service b/bootsplash-quit.service
index 272deb89..2cbdf369 100644
--- a/bootsplash-quit.service
+++ b/bootsplash-quit.service
@@ -9,5 +9,6 @@ ConditionKernelCommandLine=vga
 
 [Service]
 ExecStart=/lib/systemd/systemd-bootsplash 5
+ExecStartPost=-/bin/kill -SIGRTMIN+21 1
 Type=oneshot
 RemainAfterExit=true
diff --git a/bootsplash-shutdown.service b/bootsplash-shutdown.service
index 76d4344c..c1d4ed01 100644
--- a/bootsplash-shutdown.service
+++ b/bootsplash-shutdown.service
@@ -5,6 +5,7 @@ DefaultDependencies=no
 ConditionKernelCommandLine=splash=silent
 
 [Service]
+ExecStartPre=-/bin/kill -SIGRTMIN+20 1
 ExecStart=/lib/systemd/systemd-bootsplash 0
 Type=oneshot
 RemainAfterExit=true
diff --git a/bootsplash-startup.service b/bootsplash-startup.service
index 9f70d06b..465b8bba 100644
--- a/bootsplash-startup.service
+++ b/bootsplash-startup.service
@@ -5,6 +5,7 @@ ConditionKernelCommandLine=splash=silent
 ConditionKernelCommandLine=vga
 
 [Service]
+ExecStartPre=-/bin/kill -SIGRTMIN+20 1
 ExecStart=/lib/systemd/systemd-bootsplash 0
 Type=oneshot
 RemainAfterExit=true
diff --git a/systemd-gtk.changes b/systemd-gtk.changes
index 32be4c38..6929b332 100644
--- a/systemd-gtk.changes
+++ b/systemd-gtk.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 31 13:40:51 CET 2012 - fcrozat@suse.com
+
+- Ensure systemd show service status when started behind bootsplash
+  (bnc#736225).
+- Disable core dump redirection to journal, not stable atm.
+
+-------------------------------------------------------------------
+Thu Jan 26 16:00:27 UTC 2012 - fcrozat@suse.com
+
+- Update modules_on_boot.patch to not cause failed state for
+  systemd-modules-load.service (bnc#741481).
+
 -------------------------------------------------------------------
 Wed Jan 25 10:37:06 UTC 2012 - fcrozat@suse.com
 
diff --git a/systemd.changes b/systemd.changes
index a795f3dd..6929b332 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 31 13:40:51 CET 2012 - fcrozat@suse.com
+
+- Ensure systemd show service status when started behind bootsplash
+  (bnc#736225).
+- Disable core dump redirection to journal, not stable atm.
+
 -------------------------------------------------------------------
 Thu Jan 26 16:00:27 UTC 2012 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 39c85882..1aba2128 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -225,6 +225,12 @@ ln -s /dev/null %{buildroot}/lib/systemd/system/earlyxdm.service
 ln -s systemd-sysctl.service %{buildroot}/lib/systemd/system/sysctl.service
 ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.service
 
+# To avoid making life hard for Factory developers, don't package the
+# kernel.core_pattern setting until systemd-coredump is a part of an actual
+# systemd release and it's made clear how to get the core dumps out of the
+# journal.
+rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/coredump.conf
+
 # Install rsyslog fragment
 mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/
 install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/rsyslog.d/
@@ -323,7 +329,6 @@ rm -rf %{buildroot}
 %dir /usr/lib/binfmt.d
 %dir %{_sysconfdir}/binfmt.d
 %dir /usr/lib/sysctl.d
-/usr/lib/sysctl.d/coredump.conf
 %dir %{_sysconfdir}/sysctl.d
 %dir %{_sysconfdir}/rsyslog.d
 /usr/lib/tmpfiles.d/*.conf