From 1b9af6fd0d97562b616f0a7381791ae1337d6f16 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 14 Apr 2012 13:59:38 +0000 Subject: Actually use the THEME name passed in. The theme name passed in on the command line was never used. Use it :) --- scripts/make-boot-splash-raw | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw index 327240d..996be5a 100755 --- a/scripts/make-boot-splash-raw +++ b/scripts/make-boot-splash-raw @@ -40,7 +40,10 @@ if ( /bin/zcat $initrd_file 2> /dev/null | /bin/cpio -it &> /dev/null ); then mkdir $tmp_dir/plymouth cd $tmp_dir/plymouth || clean_and_fail /bin/zcat $initrd_file | /bin/cpio -id --quiet || clean_and_fail - /usr/libexec/plymouth/plymouth-populate-initrd -t . || clean_and_fail + + # If the theme has changed, we should remove the old one first to save space + rm -rf $tmp_dir/plymouth/usr/share/plymouth/themes + PLYMOUTH_THEME_NAME=$THEME /usr/libexec/plymouth/plymouth-populate-initrd -t . || clean_and_fail /bin/find . | \ cpio -R 0:0 -H newc -o --quiet | \ @@ -57,7 +60,7 @@ else gzip -dc $initrd_file > $tmp_initrd 2> /dev/null || clean_and_fail mount -o loop $tmp_initrd $tmp_dir 2> /dev/null || clean_and_fail rm -rf $tmp_dir/usr/share/plymouth $tmp_dir/usr/lib*/plymouth - /usr/libexec/plymouth/plymouth-populate-initrd -t $tmp_dir + PLYMOUTH_THEME_NAME=$THEME /usr/libexec/plymouth/plymouth-populate-initrd -t $tmp_dir rc=$? umount $tmp_dir 2>/dev/null [ $rc -ne 0 ] && clean_and_fail -- cgit v1.2.1