Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-11-15 09:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2012-11-08 21:52:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-11-15 09:44:11.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 14 09:12:13 UTC 2012 - [email protected] + +- 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. + +------------------------------------------------------------------- New: ---- plymouth-systemd-in-usr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.yXS8n5/_old 2012-11-15 09:44:12.000000000 +0100 +++ /var/tmp/diff_new_pack.yXS8n5/_new 2012-11-15 09:44:12.000000000 +0100 @@ -51,6 +51,8 @@ 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 @@ #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 ++++++ plymoith-sd-notforking.patch ++++++ --- /var/tmp/diff_new_pack.yXS8n5/_old 2012-11-15 09:44:12.000000000 +0100 +++ /var/tmp/diff_new_pack.yXS8n5/_new 2012-11-15 09:44:12.000000000 +0100 @@ -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 @@ [email protected] 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 @@ [email protected] 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 @@ [email protected] 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 @@ [email protected] 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 ++++++ plymouth-systemd-in-usr.patch ++++++ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
