From e06ea812fd1b3a178d42e2f6363a1ddddbd09184c4e7782defda99e375300852 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 1 Aug 2013 12:45:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=114 --- plymouth-correct-systemd-prefix.patch | 38 ++++++++++++--------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/plymouth-correct-systemd-prefix.patch b/plymouth-correct-systemd-prefix.patch index 7ce3fcc..82f6906 100644 --- a/plymouth-correct-systemd-prefix.patch +++ b/plymouth-correct-systemd-prefix.patch @@ -5,57 +5,53 @@ 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 +diff -urB a/systemd-units/plymouth-halt.service.in b/systemd-units/plymouth-halt.service.in +--- a/systemd-units/plymouth-halt.service.in 2013-04-16 14:48:40.000000000 +0200 ++++ b/systemd-units/plymouth-halt.service.in 2013-08-01 14:42:02.645779224 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Halt Screen - After=getty@tty1.service display-manager.service plymouth-start.service + After=getty@tty1.service prefdm.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 +diff -urB a/systemd-units/plymouth-kexec.service.in b/systemd-units/plymouth-kexec.service.in +--- a/systemd-units/plymouth-kexec.service.in 2013-04-16 14:48:40.000000000 +0200 ++++ b/systemd-units/plymouth-kexec.service.in 2013-08-01 14:42:20.097780068 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Reboot with kexec Screen - After=getty@tty1.service display-manager.service plymouth-start.service + After=getty@tty1.service prefdm.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 +diff -urB a/systemd-units/plymouth-poweroff.service.in b/systemd-units/plymouth-poweroff.service.in +--- a/systemd-units/plymouth-poweroff.service.in 2013-04-16 14:48:40.000000000 +0200 ++++ b/systemd-units/plymouth-poweroff.service.in 2013-08-01 14:42:38.393780954 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Power Off Screen - After=getty@tty1.service display-manager.service plymouth-start.service + After=getty@tty1.service prefdm.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 +diff -urB a/systemd-units/plymouth-reboot.service.in b/systemd-units/plymouth-reboot.service.in +--- a/systemd-units/plymouth-reboot.service.in 2013-04-16 14:48:40.000000000 +0200 ++++ b/systemd-units/plymouth-reboot.service.in 2013-08-01 14:43:17.673782855 +0200 @@ -1,7 +1,7 @@ [Unit] Description=Show Plymouth Reboot Screen - After=getty@tty1.service display-manager.service plymouth-start.service + After=getty@tty1.service prefdm.service plymouth-start.service -Before=reboot.service +Before=systemd-reboot.service DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 - + -- cgit v0.9.0.2-2-gbebe