Only install plymouth logo file if it exists

Release 4

diff --git a/dracut.spec b/dracut.spec
index 9420737708908f15012b8360ee57b94f36efde8a..939c426d9f83ec622342b84e2ba020c26ec42738 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,7 +1,7 @@
 Summary:       Initramfs generator using udev
 Name:          dracut
 Version:       020
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         Base
 Source0:       ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
@@ -12,6 +12,7 @@ Patch1:               bash-sh.patch
 Patch2:                plymouth-libexec.patch
 Patch3:                reboot-opts.patch
 Patch4:                os-release.patch
+Patch5:                plymouth-logo.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
@@ -138,6 +139,7 @@ configuration.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 

diff --git a/plymouth-logo.patch b/plymouth-logo.patch
new file mode 100644 (file)
index 0000000..9f619d8
--- /dev/null
+++ b/plymouth-logo.patch
@@ -0,0 +1,14 @@
+--- dracut-020/modules.d/50plymouth/plymouth-populate-initrd.sh~       2012-08-09 13:49:07.894845601 +0200
++++ dracut-020/modules.d/50plymouth/plymouth-populate-initrd.sh        2012-08-09 13:50:43.211508906 +0200
+@@ -6,9 +6,10 @@
+ 
+ inst /sbin/plymouthd /bin/plymouthd
+ dracut_install /bin/plymouth \
+-    "${PLYMOUTH_LOGO_FILE}" \
+     /etc/os-release
+ 
++[[ -f "${PLYMOUTH_LOGO_FILE}" ]] && dracut_install "${PLYMOUTH_LOGO_FILE}"
++
+ mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
+ 
+ inst_libdir_file "plymouth/text.so" "plymouth/details.so"