aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2009-02-06 17:06:25 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2009-02-06 17:06:25 +0000
commitee46bc7bbddea0ec57b8d1c5ea7db605e599333b (patch)
tree30a13fc76d0fc88510670d8011a603dc8368caed /scripts
parentd901fe64948b85e64fdc0c79a6d6e152f0b603fc (diff)
downloadbootsplash-ee46bc7bbddea0ec57b8d1c5ea7db605e599333b.tar
bootsplash-ee46bc7bbddea0ec57b8d1c5ea7db605e599333b.tar.gz
bootsplash-ee46bc7bbddea0ec57b8d1c5ea7db605e599333b.tar.bz2
bootsplash-ee46bc7bbddea0ec57b8d1c5ea7db605e599333b.tar.xz
bootsplash-ee46bc7bbddea0ec57b8d1c5ea7db605e599333b.zip
- Release 3.2.18 :
- fix location of splashy themes
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/make-boot-splash-raw6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw
index 9c201c0..eb99109 100755
--- a/scripts/make-boot-splash-raw
+++ b/scripts/make-boot-splash-raw
@@ -28,10 +28,10 @@ fi
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' > $tmp_dir/initrd
+ /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/.*), and print $1 . "\n" . dirname($1) . "\n"' \
+ | perl -MFile::Basename -ne 'm,^/(etc/splashy/.*|usr/share/splashy/themes/.*), 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
@@ -48,7 +48,7 @@ else
gzip -dc $initrd_file > $tmp_initrd
mount -o loop $tmp_initrd $tmp_dir
rm -rf $tmp_dir/etc/splashy
- for f in `/usr/sbin/splashy_find_files | grep ^/etc/splashy`; do
+ for f in `/usr/sbin/splashy_find_files | egrep ^/etc/splashy\|/usr/share/splashy/themes`; do
d=`dirname $f`
mkdir -p $tmp_dir$d
cp -aL $f $tmp_dir$d