From 009e186b696501fa8dcad18f76ce23fc2e836461 Mon Sep 17 00:00:00 2001
From: Malte Poll <mp@edgeless.systems>
Date: Fri, 25 Mar 2022 16:41:39 +0100
Subject: [PATCH] CoreOS dm-verity: do not compress GCP images twice

---
 images/fcos/dm-verity/recalculate-dm-verity.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/fcos/dm-verity/recalculate-dm-verity.sh b/images/fcos/dm-verity/recalculate-dm-verity.sh
index eee1fb44b..ecaa3c189 100755
--- a/images/fcos/dm-verity/recalculate-dm-verity.sh
+++ b/images/fcos/dm-verity/recalculate-dm-verity.sh
@@ -163,8 +163,8 @@ repack () {
 
     gcp)
         echo "📥 Repacking GCP image..."
-        tar --use-compress-program=pigz --owner=0 --group=0 -C "${unpacked_image_dir}" -Sch --format=oldgnu -f "${tmp_tar_file}" "${unpacked_image_filename}"
-        "${PV}" "${tmp_tar_file}" | gzip -9c  > "${packed_image}"
+        tar --owner=0 --group=0 -C "${unpacked_image_dir}" -Sch --format=oldgnu -f "${tmp_tar_file}" "${unpacked_image_filename}"
+        "${PV}" "${tmp_tar_file}" | pigz -9c  > "${packed_image}"
         rm "${tmp_tar_file}"
         echo "  Repacked image stored in ${packed_image}"
         ;;