From cc6b3e5e91415bfef956764eee3527f83fc63816c90293504e020bb508a43fcf Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Wed, 14 Nov 2012 10:15:18 +0000 Subject: [PATCH] Accepting request 141258 from home:seife:branches:Base:System - fix path to systemd-tty-ask-password-agent for newer systemd - create the pid file again during boot, the existence of this is a condition for systemd-ask-password-plymouth.service. A proper fix might look different but that get's it going again. OBS-URL: https://build.opensuse.org/request/show/141258 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=93 --- plymoith-sd-notforking.patch | 22 ++++++++++++++++------ plymouth-systemd-in-usr.patch | 12 ++++++++++++ plymouth.changes | 8 ++++++++ plymouth.spec | 6 ++++++ 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 plymouth-systemd-in-usr.patch diff --git a/plymoith-sd-notforking.patch b/plymoith-sd-notforking.patch index d8ffb3e..f91523b 100644 --- a/plymoith-sd-notforking.patch +++ b/plymoith-sd-notforking.patch @@ -1,6 +1,8 @@ --- systemd-units/plymouth-halt.service.in.orig +++ systemd-units/plymouth-halt.service.in -@@ -6,6 +6,5 @@ DefaultDependencies=no +@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service + Before=halt.service + DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] @@ -10,7 +12,9 @@ -Type=forking --- systemd-units/plymouth-kexec.service.in.orig +++ systemd-units/plymouth-kexec.service.in -@@ -6,6 +6,5 @@ DefaultDependencies=no +@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service + Before=kexec.service + DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] @@ -20,7 +24,9 @@ -Type=forking --- systemd-units/plymouth-poweroff.service.in.orig +++ systemd-units/plymouth-poweroff.service.in -@@ -6,6 +6,5 @@ DefaultDependencies=no +@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service + Before=poweroff.service + DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] @@ -30,7 +36,9 @@ -Type=forking --- systemd-units/plymouth-reboot.service.in.orig +++ systemd-units/plymouth-reboot.service.in -@@ -6,6 +6,5 @@ DefaultDependencies=no +@@ -4,8 +4,7 @@ After=getty@tty1.service prefdm.service + Before=reboot.service + DefaultDependencies=no ConditionKernelCommandLine=!plymouth.enable=0 [Service] @@ -40,12 +48,14 @@ -Type=forking --- systemd-units/plymouth-start.service.in.orig +++ systemd-units/plymouth-start.service.in -@@ -7,8 +7,7 @@ Before=systemd-ask-password-plymouth.ser +@@ -5,10 +5,9 @@ Wants=systemd-ask-password-plymouth.path + After=systemd-vconsole-setup.service systemd-udev-trigger.service + Before=systemd-ask-password-plymouth.service ConditionKernelCommandLine=!plymouth.enable=0 [Service] -ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=boot --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --no-daemon --attach-to-session ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash -Type=forking KillMode=none diff --git a/plymouth-systemd-in-usr.patch b/plymouth-systemd-in-usr.patch new file mode 100644 index 0000000..97b6e88 --- /dev/null +++ b/plymouth-systemd-in-usr.patch @@ -0,0 +1,12 @@ +Index: b/systemd-units/systemd-ask-password-plymouth.service.in +=================================================================== +--- a/systemd-units/systemd-ask-password-plymouth.service.in ++++ b/systemd-units/systemd-ask-password-plymouth.service.in +@@ -6,6 +6,6 @@ After=plymouth-start.service + Before=shutdown.target + ConditionKernelCommandLine=!plymouth.enable=0 + ConditionPathExists=/run/plymouth/pid + + [Service] +-ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth ++ExecStart=/usr/bin/systemd-tty-ask-password-agent --watch --plymouth diff --git a/plymouth.changes b/plymouth.changes index 3bcf526..275a281 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 14 09:12:13 UTC 2012 - seife+obs@b1-systems.com + +- fix path to systemd-tty-ask-password-agent for newer systemd +- create the pid file again during boot, the existence of this is + a condition for systemd-ask-password-plymouth.service. A proper + fix might look different but that get's it going again. + ------------------------------------------------------------------- Tue Nov 6 18:07:29 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index a388c72..fc734f5 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -51,6 +51,8 @@ Patch10: 0001-Some-greenish-openSUSE-colors.patch Patch11: plymouth-remove-pid-file.patch Patch12: plymoith-sd-notforking.patch Patch13: ply-sdunitdir.patch +# PATCH-OPENSUSE -- systemd-tty-ask-password-agent is in /usr/bin now. +Patch14: plymouth-systemd-in-usr.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -327,6 +329,10 @@ plugin. #patch11 -p1 %patch12 %patch13 +# haha, evil condition... :-) +%if "0%(type -p systemd-tty-ask-password-agent)" == "0/usr/bin/systemd-tty-ask-password-agent" +%patch14 -p1 +%endif # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c