diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2006-04-10 17:44:17 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2006-04-10 17:44:17 +0000 |
| commit | b288acc138d72ccda7ec27967089ddc4c71ce978 (patch) | |
| tree | 3302907680ba91bc51c1b80c590fdb34b8f1e2f1 | |
| parent | 2b52430853c2c51a17bc8989643e047f0f0c729d (diff) | |
| download | bootsplash-b288acc138d72ccda7ec27967089ddc4c71ce978.tar bootsplash-b288acc138d72ccda7ec27967089ddc4c71ce978.tar.gz bootsplash-b288acc138d72ccda7ec27967089ddc4c71ce978.tar.bz2 bootsplash-b288acc138d72ccda7ec27967089ddc4c71ce978.tar.xz bootsplash-b288acc138d72ccda7ec27967089ddc4c71ce978.zip | |
Fix initramfs support (use cpio -c)
| -rw-r--r-- | bootsplash.spec | 5 | ||||
| -rwxr-xr-x | scripts/make-boot-splash | 2 | ||||
| -rw-r--r-- | scripts/remove-boot-splash | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index a53a680..b530b26 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,5 +1,5 @@ %define name bootsplash -%define version 3.1.11 +%define version 3.1.12 %define release %mkrel 1 %define _bootdir /boot @@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Mon Apr 10 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 3.1.12-1mdk +- Fix initramfs support (use cpio -c) + * Mon Apr 10 2006 Warly <warly@mandriva.com> 3.1.11-1mdk - Do not require mkinitrd (mkinird will now prereq bootsplash) - Handle initramfs in make-boot-splash and remove-boot-splash diff --git a/scripts/make-boot-splash b/scripts/make-boot-splash index 9bf64a0..6a5a236 100755 --- a/scripts/make-boot-splash +++ b/scripts/make-boot-splash @@ -59,7 +59,7 @@ if `/bin/zcat $initrd_file 2> /dev/null | /bin/cpio -t &> /dev/null`; then rm -f $tmp_dir/bootsplash fi fi - /bin/find . -print | /bin/cpio -o 2> /dev/null | gzip -c > $initrd_file + /bin/find . -print | cpio --quiet -c -o 2> /dev/null | gzip -c > $initrd_file popd &> /dev/null rm -rf $tmp_dir else diff --git a/scripts/remove-boot-splash b/scripts/remove-boot-splash index 3ab7425..f7e7b63 100644 --- a/scripts/remove-boot-splash +++ b/scripts/remove-boot-splash @@ -16,7 +16,7 @@ if (!system("/bin/zcat $initrd 2> /dev/null | /bin/cpio -t &> /dev/null")) { if (-f "$tmp_dir/bootsplash") { unlink "$tmp_dir/bootsplash" or die "FATAL: removing of $tmp_dir/bootsplash failed"; print STDERR "remove-boot-splash: removing bootsplash from initrd\n"; - system("/bin/find . -print | /bin/cpio -o 2> /dev/null | gzip -c > $initrd") + system("/bin/find . -print | /bin/cpio --quiet -c -o 2> /dev/null | gzip -c > $initrd") } else { print STDERR "ERROR remove-boot-splash: bootsplash image not found in $initrd\n" } |