aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xscripts/make-boot-splash-raw4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 14cb85b..dd0535d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME=bootsplash
-VERSION := 3.2.18
+VERSION := 3.2.19
SUBDIRS=scripts fb fbmngplay fbtruetype splash po
FILES=$(SUBDIRS) Makefile ChangeLog README
diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw
index eb99109..5b03e2d 100755
--- a/scripts/make-boot-splash-raw
+++ b/scripts/make-boot-splash-raw
@@ -30,8 +30,8 @@ if `/bin/zcat $initrd_file 2> /dev/null | /bin/cpio -t &> /dev/null`; then
tmp_dir=`mktemp -d`
/bin/zcat $initrd_file | cpio-filter --exclude 'bootsplash|etc/splashy|usr/share/splashy/themes' > $tmp_dir/initrd
if [ -x /sbin/splashy ]; then
- (echo /etc/splashy/themes; /usr/sbin/splashy_find_files) \
- | perl -MFile::Basename -ne 'm,^/(etc/splashy/.*|usr/share/splashy/themes/.*), and print $1 . "\n" . dirname($1) . "\n"' \
+ (echo /etc/splashy/themes ; echo /usr/share/splashy/themes ; /usr/sbin/splashy_find_files ) \
+ | perl -MFile::Basename -ne 'm,^/(etc/splashy/.*|usr/share/splashy/.*), and print $1 . "\n" . dirname($1) . "\n"' \
| sort -u | (cd / ; cpio -o -c -L --quiet -O $tmp_dir/initrd --append)
elif [[ -x /sbin/splash ]]; then
/sbin/splash -s -f $config > $tmp_dir/bootsplash