diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2009-10-12 14:02:59 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2009-10-12 14:02:59 +0000 |
| commit | 030cdae925f422b8ce3e20da59405d1b0acb5e6a (patch) | |
| tree | 3b6e3b763c2e172afdb57fd0c23fe34686621e62 | |
| parent | 8cd65dee04c730ab2e781d6e2f0f5c86a684c790 (diff) | |
| download | bootsplash-030cdae925f422b8ce3e20da59405d1b0acb5e6a.tar bootsplash-030cdae925f422b8ce3e20da59405d1b0acb5e6a.tar.gz bootsplash-030cdae925f422b8ce3e20da59405d1b0acb5e6a.tar.bz2 bootsplash-030cdae925f422b8ce3e20da59405d1b0acb5e6a.tar.xz bootsplash-030cdae925f422b8ce3e20da59405d1b0acb5e6a.zip | |
- remove splashy leftover in initrd
- hide error message
| -rwxr-xr-x | scripts/make-boot-splash-raw | 2 | ||||
| -rw-r--r-- | scripts/remove-boot-splash | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make-boot-splash-raw b/scripts/make-boot-splash-raw index 52bdd7e..6fe160b 100755 --- a/scripts/make-boot-splash-raw +++ b/scripts/make-boot-splash-raw @@ -17,7 +17,7 @@ THEME=$2 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 'usr/share/plymouth|usr/lib/plymouth|usr/lib64/plymouth|bin/plymouth|lib/libply|usr/lib/libply|lib64/libply|usr/lib64/libply' > $tmp_dir/initrd + /bin/zcat $initrd_file 2> /dev/null | cpio-filter --exclude 'usr/share/plymouth|usr/lib/plymouth|usr/lib64/plymouth|bin/plymouth|lib/libply|usr/lib/libply|lib64/libply|usr/lib64/libply' > $tmp_dir/initrd if [ -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then mkdir $tmp_dir/plymouth /usr/libexec/plymouth/plymouth-populate-initrd -t $tmp_dir/plymouth diff --git a/scripts/remove-boot-splash b/scripts/remove-boot-splash index c7317e5..ee973a2 100644 --- a/scripts/remove-boot-splash +++ b/scripts/remove-boot-splash @@ -14,7 +14,7 @@ if (!system("/bin/zcat $initrd 2> /dev/null | /bin/cpio -t &> /dev/null")) { chdir $tmp_dir; system("/bin/zcat $initrd 2>/dev/null | /bin/cpio -id 2>/dev/null"); if (-d "$tmp_dir/usr/share/plymouth") { - system("rm -fr $tmp_dir/usr/share/plymouth $tmp_dir/usr/lib/plymouth $tmp_dir/usr/lib/libply* $tmp_dir/lib/libply* $tmp_dir/bin/plymouthd $tmp_dir/bin/plymouth"); + system("rm -fr $tmp_dir/usr/share/plymouth $tmp_dir/usr/lib/plymouth $tmp_dir/usr/lib/libply* $tmp_dir/lib/libply* $tmp_dir/bin/plymouthd $tmp_dir/bin/plymouth $tmp_dir/etc/splashy $tmp_dir/usr/share/splashy"); print STDERR "remove-boot-splash: removing plymouth from initrd\n"; system("/bin/find . -print | /bin/cpio --quiet -c -o 2> /dev/null | gzip -c > $initrd") } else { |