Accepting request 102201 from Base:System

- Ensure systemd show service status when started behind bootsplash
  (bnc#736225).
- Disable core dump redirection to journal, not stable atm.

- Update modules_on_boot.patch to not cause failed state for
  systemd-modules-load.service (bnc#741481).

OBS-URL: https://build.opensuse.org/request/show/102201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=86

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

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

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

modules_on_boot.patch

@@ -21,7 +21,7 @@ Index: systemd-37/src/modules-load.c
  
          if (argc > 1) {
                  log_error("This program takes no argument.");
-@@ -126,6 +129,42 @@ int main(int argc, char *argv[]) {
+@@ -126,6 +129,43 @@ int main(int argc, char *argv[]) {
          }
  
          strv_free(files);
@@ -29,9 +29,10 @@ Index: systemd-37/src/modules-load.c
 +        if ((r = parse_env_file("/etc/sysconfig/kernel", NEWLINE,
 +                                "MODULES_LOADED_ON_BOOT", &modules_on_boot,
 +                                NULL)) < 0) {
-+                        if (r != -ENOENT)
-+                                log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r));
-+        }
++                if (r != -ENOENT)
++                        log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r));
++        } else
++                r = EXIT_SUCCESS;
 +        if (modules_on_boot) {
 +                char **modules = strv_split(modules_on_boot,WHITESPACE);
 +                char **module;
@@ -64,7 +65,7 @@ Index: systemd-37/src/modules-load.c
  finish:
  
          if (n_arguments > 3) {
-@@ -138,6 +177,9 @@ finish:
+@@ -138,6 +178,9 @@ finish:
          }
  
          strv_free(arguments);

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
 

systemd.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
 

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