OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=113

plymouth-correct-systemd-prefix.patch

@@ -0,0 +1,61 @@
+From 53f6b44e11cf552e67fb3b45f480eb55dbf2a975 Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat@suse.com>
+Date: Mon, 29 Jul 2013 15:41:30 +0000
+Subject: systemd units: halt/reboot/kexec/power systemd unit have changed names
+
+Ensure we use the new 'systemd-' prefixed names now.
+---
+diff --git a/systemd-units/plymouth-halt.service.in b/systemd-units/plymouth-halt.service.in
+index 3df710a..fd27e10 100644
+--- a/systemd-units/plymouth-halt.service.in
++++ b/systemd-units/plymouth-halt.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Show Plymouth Halt Screen
+ After=getty@tty1.service display-manager.service plymouth-start.service
+-Before=halt.service
++Before=systemd-halt.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+diff --git a/systemd-units/plymouth-kexec.service.in b/systemd-units/plymouth-kexec.service.in
+index 75702ae..8aa661d 100644
+--- a/systemd-units/plymouth-kexec.service.in
++++ b/systemd-units/plymouth-kexec.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Show Plymouth Reboot with kexec Screen
+ After=getty@tty1.service display-manager.service plymouth-start.service
+-Before=kexec.service
++Before=systemd-kexec.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+diff --git a/systemd-units/plymouth-poweroff.service.in b/systemd-units/plymouth-poweroff.service.in
+index 35ff352..305ece6 100644
+--- a/systemd-units/plymouth-poweroff.service.in
++++ b/systemd-units/plymouth-poweroff.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Show Plymouth Power Off Screen
+ After=getty@tty1.service display-manager.service plymouth-start.service
+-Before=poweroff.service
++Before=systemd-poweroff.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+diff --git a/systemd-units/plymouth-reboot.service.in b/systemd-units/plymouth-reboot.service.in
+index 514ca00..ce56855 100644
+--- a/systemd-units/plymouth-reboot.service.in
++++ b/systemd-units/plymouth-reboot.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Show Plymouth Reboot Screen
+ After=getty@tty1.service display-manager.service plymouth-start.service
+-Before=reboot.service
++Before=systemd-reboot.service
+ DefaultDependencies=no
+ ConditionKernelCommandLine=!plymouth.enable=0
+ 
+--
+cgit v0.9.0.2-2-gbebe

plymouth.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 29 16:23:21 UTC 2013 - tittiatcoke@gmail.com
+
+- Add upstream patch plymouth-correct-systemd-prefix.patch to 
+  correct the systemd prefixes in some systemd files. This replaces
+  the sed string.
+
 -------------------------------------------------------------------
 Thu Jun 27 19:39:15 UTC 2013 - crrodriguez@opensuse.org
 

plymouth.spec

@@ -53,6 +53,8 @@ Patch19:        plymouth-redirect-null.patch
 Patch20:        plymouth-exit-code.patch
 # PATCH-FIX-UPSTREAM plymouth-terminal-session-close.patch fcrozat@suse.com -- do not close already closed terminal session fd
 Patch21:        plymouth-terminal-session-close.patch
+# PATCH-FIX-UPSTREAM plymouth-correct-systemd-prefix.patch tittiatcoke@gmail.com -- Use the correct systemd prefixes
+Patch22:        plymouth-correct-systemd-prefix.patch
 BuildRequires:  automake
 BuildRequires:  kernel-headers
 BuildRequires:  libtool
@@ -329,6 +331,7 @@ plugin.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
 
@@ -383,8 +386,6 @@ cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfd
 mkdir -p %{buildroot}/lib/mkinitrd/scripts
 install -t %{buildroot}/lib/mkinitrd/scripts \
 	   scripts/{setup,boot}-plymouth*.sh
-find %{buildroot} -type f -name "*.service" -print -exec sed -i -e 's@prefdm.service@display-manager.service@g' \
--e 's@\<\(reboot\|halt\|poweroff\|kexec\).service\>@systemd-\1.service@g'  {} +
 
 %post
 if [ ! -e /.buildenv ]; then