From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 22 Mar 2012 22:37:05 +0000 (+0000)
Subject: - fix plymouth libexec path
X-Git-Tag: auto/th/dracut-017-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=88d9ea8369b677371c2b42503caaf8152720df57;p=packages%2Fdracut.git

- fix plymouth libexec path

Changed files:
    dracut.spec -> 1.13
    plymouth-libexec.patch -> 1.1
---

diff --git a/dracut.spec b/dracut.spec
index 11a2fda..b1355c1 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,7 +1,7 @@
 Summary:	Initramfs generator using udev
 Name:		dracut
 Version:	017
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Base
 Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -10,6 +10,7 @@ Source1:	pld.conf
 Patch0:		no-rh.patch
 Patch1:		create-target-dir-for-symlink.patch
 Patch2:		bash-sh.patch
+Patch3:		plymouth-libexec.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
@@ -129,6 +130,9 @@ configuration.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 
 %build
 %{__make}
diff --git a/plymouth-libexec.patch b/plymouth-libexec.patch
new file mode 100644
index 0000000..dbdd133
--- /dev/null
+++ b/plymouth-libexec.patch
@@ -0,0 +1,20 @@
+--- dracut-017/modules.d/./50plymouth/module-setup.sh~	2012-03-23 00:34:27.000000000 +0200
++++ dracut-017/modules.d/./50plymouth/module-setup.sh	2012-03-23 00:34:29.115606192 +0200
+@@ -35,13 +35,13 @@
+ }
+ 
+ install() {
+-    if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
+-        || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/libexec/plymouth/plymouth-populate-initrd \
+-        || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
++    if grep -q nash /usr/@lib@/plymouth/plymouth-populate-initrd \
++        || ! grep -q PLYMOUTH_POPULATE_SOURCE_FUNCTIONS /usr/@lib@/plymouth/plymouth-populate-initrd \
++        || [ ! -x /usr/@lib@/plymouth/plymouth-populate-initrd ]; then
+         . "$moddir"/plymouth-populate-initrd.sh
+     else
+         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
+-            /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
++            /usr/@lib@/plymouth/plymouth-populate-initrd -t $initdir
+     fi
+ 
+     inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh