From 77ca80f75b03ece200ef39c873dc2c3a03884864 Mon Sep 17 00:00:00 2001
From: Lichen Liu <lichliu@redhat.com>
Date: Dec 22 2022 06:36:23 +0000
Subject: fadump: use 'zstd' as the default compression method


Resolves: bz2139000
Upstream: Fedora
Conflict: None

commit f98bd5895e74043430b927828b0bd6944073e0cd
Author: Hari Bathini <hbathini@linux.ibm.com>
Date:   Fri Dec 2 18:46:49 2022 +0530

    fadump: use 'zstd' as the default compression method

    If available, use 'zstd' compression method to optimize the size of
    the initrd built with fadump support. Also, 'squash+zstd' is not
    preferred because more disk space is consumed with 'squash+zstd' due
    to the additional binaries needed for fadump with squash case.

    Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
    Acked-by: Tao Liu <ltao@redhat.com>
    Reviewed-by: Philipp Rudo <prudo@redhat.com>

Signed-off-by: Lichen Liu <lichliu@redhat.com>

---

diff --git a/mkfadumprd b/mkfadumprd
index 36ad645..2fc396c 100644
--- a/mkfadumprd
+++ b/mkfadumprd
@@ -62,11 +62,9 @@ _dracut_isolate_args=(
 	/usr/lib/dracut/fadump-kernel-modules.txt
 )
 
-# Same as setting zstd in mkdumprd
+# Use zstd compression method, if available
 if ! have_compression_in_dracut_args; then
-	if is_squash_available && dracut_have_option "--squash-compressor"; then
-		_dracut_isolate_args+=(--squash-compressor zstd)
-	elif is_zstd_command_available; then
+	if is_zstd_command_available; then
 		_dracut_isolate_args+=(--compress zstd)
 	fi
 fi