]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
populate-initrd: support theme subfolders
authorRay Strode <rstrode@redhat.com>
Mon, 11 Apr 2016 11:47:07 +0000 (07:47 -0400)
committerRay Strode <rstrode@redhat.com>
Mon, 11 Apr 2016 11:48:40 +0000 (07:48 -0400)
Some themes like to keep their content in subfolders,
but plymouth-populate-initrd currently fails to copy
those subfolders over to the initrd.

This commit fixes that.

https://bugzilla.gnome.org/show_bug.cgi?id=94883

scripts/plymouth-populate-initrd.in

index 43c7f22c91c64c6a48aadbbf55ef72e154f2d29c..49d8eea4762a929ad394c6f97021cb6b758d5d86 100755 (executable)
@@ -408,10 +408,7 @@ inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
 inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
 
 if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-    for x in ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
-        [ ! -f "$x" ] && continue
-        inst $x $INITRDDIR
-    done
+    inst ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} $INITRDDIR
 fi
 
 if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then