[PATCH 02/11] fixed plymouth installation for plymouth-0.7.0-0.2009.05.08.1.fc11

[PATCH 02/11] fixed plymouth installation for plymouth-0.7.0-0.2009.05.08.1.fc11

[Harald Hoyer]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

---
  modules.d/50plymouth/plymouth-populate-initrd |   13 +++++++++----
  1 files changed, 9 insertions(+), 4 deletions(-)



[-- Attachment #2: 41fab50b5fe4a242324fd1cd4caa8079b18c17fc.diff --]
[-- Type: text/x-patch, Size: 1341 bytes --]

diff --git a/modules.d/50plymouth/plymouth-populate-initrd b/modules.d/50plymouth/plymouth-populate-initrd
index e195ddc..ed05e9b 100755
--- a/modules.d/50plymouth/plymouth-populate-initrd
+++ b/modules.d/50plymouth/plymouth-populate-initrd
@@ -5,18 +5,23 @@ else
     LIBDIR="/usr/lib"
 fi
 PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
-PLYMOUTH_PLUGIN_NAME=$(plymouth-set-default-plugin)
+PLYMOUTH_PLUGIN_NAME=$(plymouth-set-default-theme)
 
 inst /sbin/plymouthd /bin/plymouthd
 dracut_install /bin/plymouth "${LIBDIR}/plymouth/text.so" \
     "${LIBDIR}/plymouth/details.so" "${PLYMOUTH_LOGO_FILE}" \
-    /etc/system-release "${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME:=text}.so"
+    /etc/system-release 
+
+if [[ -f "${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME:=text}.so" ]]; then
+    dracut_install "${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME:=text}.so" 
+fi
+
 mkdir -p "${initdir}/usr/share/plymouth"
 
 [[ -f ${LIBDIR}/plymouth/default.so ]] && inst ${LIBDIR}/plymouth/default.so
 
-if [[ -d /usr/share/plymouth/${PLYMOUTH_PLUGIN_NAME} ]]; then
-    for x in "/usr/share/plymouth/${PLYMOUTH_PLUGIN_NAME}"/* ; do
+if [[ -d /usr/share/plymouth/themes/${PLYMOUTH_PLUGIN_NAME} ]]; then
+    for x in "/usr/share/plymouth/themes/${PLYMOUTH_PLUGIN_NAME}"/* ; do
         [[ -f "$x" ]] || break
         inst $x
     done