do not use dracut shutdown, if something failed while unpacking

also require "xzcat"
master
Harald Hoyer 2012-04-05 13:49:31 +02:00
parent f5af0df821
commit 50bc2253d3
2 changed files with 12 additions and 3 deletions

View File

@ -6,5 +6,14 @@ set -e
cd /run/initramfs
IMG="/boot/initramfs-$(uname -r).img"
[ -f .need_shutdown -a -f "$IMG" ] || exit 1
zcat "$IMG" | cpio -id >/dev/null 2>&1
rm .need_shutdown
if zcat "$IMG" | cpio -id >/dev/null 2>&1; then
rm .need_shutdown
elif xzcat "$IMG" | cpio -id >/dev/null 2>&1; then
rm .need_shutdown
else
# something failed, so we clean up
rm -f /run/initramfs/shutdown
exit 1
fi

exit 0

View File

@ -73,7 +73,7 @@ Requires: filesystem >= 2.1.0
Requires: findutils
Requires: grep
Requires: hardlink
Requires: gzip
Requires: gzip xz
Requires: module-init-tools >= 3.7-9
Requires: sed
Requires: udev > 166