- fix paths to plymouthd

diff --git a/dracut.spec b/dracut.spec
index 1dee9d8256a1b3c0323f32ee20fdc8c639596f60..9a66c78bef6f61adce0197f4c0eeeef0e5a06113 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -14,6 +14,7 @@ Patch2:               os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch
 Patch5:                systemd-paths.patch
+Patch6:                plymouthd-path.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -181,6 +182,7 @@ konfiguracji maszyn.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh

diff --git a/plymouthd-path.patch b/plymouthd-path.patch
new file mode 100644 (file)
index 0000000..4084ccb
--- /dev/null
+++ b/plymouthd-path.patch
@@ -0,0 +1,20 @@
+--- /home/users/baggins/rpm/BUILD/dracut-026/modules.d/50plymouth/plymouth-pretrigger.sh~      2013-03-08 07:07:48.000000000 +0100
++++ /home/users/baggins/rpm/BUILD/dracut-026/modules.d/50plymouth/plymouth-pretrigger.sh       2013-03-21 15:31:40.449408516 +0100
+@@ -2,7 +2,7 @@
+ # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+ # ex: ts=8 sw=4 sts=4 et filetype=sh
+ 
+-if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
++if [ -x /sbin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
+     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
+         # first trigger graphics subsystem
+         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
+@@ -16,7 +16,7 @@
+         read consoledev rest < /sys/class/tty/console/active
+         consoledev=${consoledev:-tty0}
+         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
+-        [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
++        [ -x /sbin/plymouthd ] && /sbin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
+         /bin/plymouth --show-splash 2>&1 | vinfo
+         # reset tty after plymouth messed with it
+         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"