Skip to content

Commit 4688695

Browse files
aafeijoo-susejohannbg
authored andcommitted
fix(dracut-initramfs-restore.sh): unpack uncompressed initrd as last option
Attempting to unpack the initrd assuming it is uncompressed when it is delays the shutdown process by several seconds. This must be the last check.
1 parent 0ef40d8 commit 4688695

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: dracut-initramfs-restore.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ fi
5151

5252
cd /run/initramfs
5353

54-
if $SKIP "$IMG" | cpio -id --no-absolute-filenames --quiet > /dev/null \
55-
|| $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet > /dev/null \
54+
if $SKIP "$IMG" | zcat | cpio -id --no-absolute-filenames --quiet > /dev/null \
5655
|| $SKIP "$IMG" | bzcat | cpio -id --no-absolute-filenames --quiet > /dev/null \
5756
|| $SKIP "$IMG" | xzcat | cpio -id --no-absolute-filenames --quiet > /dev/null \
5857
|| $SKIP "$IMG" | lz4 -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \
5958
|| $SKIP "$IMG" | lzop -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \
60-
|| $SKIP "$IMG" | zstd -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null; then
59+
|| $SKIP "$IMG" | zstd -d -c | cpio -id --no-absolute-filenames --quiet > /dev/null \
60+
|| $SKIP "$IMG" | cpio -id --no-absolute-filenames --quiet > /dev/null; then
6161
rm -f -- .need_shutdown
6262
else
6363
# something failed, so we clean up

0 commit comments

Comments
 (0)