do not use dracut shutdown, if something failed while unpacking

also require "xzcat"

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 26b698b90635a8f059a7c1cfe63e17d2b7ae25ef..06e2939fb62487e84fd5a58af4b28c43401ca49b 100644 (file)
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -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

diff --git a/dracut.spec b/dracut.spec
index fa3fa39a0e2f68e006b9b113171641edc5ea5f85..074cb10a4541ccd8602544bc23f59bf605c0ae7b 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -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