aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xscripts/make-boot-splash-raw11
2 files changed, 4 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index c01616c..9ba1bb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME=bootsplash
-VERSION := 3.2.4
+VERSION := 3.2.5
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 e453b55..f5279fe 100755
--- a/scripts/make-boot-splash-raw
+++ b/scripts/make-boot-splash-raw
@@ -28,17 +28,12 @@ fi
if `/bin/zcat $initrd_file 2> /dev/null | /bin/cpio -t &> /dev/null`; then
tmp_dir=`mktemp -d`
- pushd $tmp_dir &> /dev/null
- /bin/zcat $initrd_file 2>/dev/null | /bin/cpio -id 2>/dev/null
+ /bin/zcat $initrd_file | cpio-filter --exclude bootsplash > $tmp_dir/initrd
if [[ -x /sbin/splash ]]; then
/sbin/splash -s -f $config > $tmp_dir/bootsplash
- else
- if [[ -f $tmp_dir/bootsplash ]]; then
- rm -f $tmp_dir/bootsplash
- fi
+ echo bootsplash | (cd $tmp_dir ; cpio -o -c -O $tmp_dir/initrd --append)
fi
- /bin/find . -print | cpio --quiet -c -o 2> /dev/null | gzip -c > $initrd_file
- popd &> /dev/null
+ gzip -c $tmp_dir/initrd > $initrd_file
rm -rf $tmp_dir
else
$splash_dir/scripts/remove-boot-splash $initrd_file