From 0f96aaa90aec12566bc1e93ca9561e2d0eaa6d15 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 18 Oct 2021 13:54:26 +0200
Subject: [PATCH] add more compress options

---
 usr/bin/archboot-setup.sh      | 5 +++--
 usr/bin/archboot-x86_64-iso.sh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index 003595e8a..8da3ce358 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -4324,7 +4324,8 @@ do_grub_uefi() {
             --fonts="unicode" \
             --locales="en@quot" \
             --themes="" \
-            --compress xz \
+            --compress lzo \
+            --core-compress xz \
             --verbose \
             --output="${UEFISYS_MOUNTPOINT}/EFI/grub/grub${_SPEC_UEFI_ARCH}_standalone.efi" \
             "/boot/grub/grub.cfg=/tmp/grub.cfg" &> "/tmp/grub_uefi_${_UEFI_ARCH}_mkstandalone.log"
@@ -4364,7 +4365,7 @@ do_grub_uefi() {
                         search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb \
                         usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard"
         # add -v for verbose
-        _COMMON_GRUB_OPTIONS="--compress xz --sbat /tmp/sbat.csv --modules="${_GRUB_MODULES}" --fonts="unicode" --locales="en@quot" --themes="""
+        _COMMON_GRUB_OPTIONS="--compress lzo --core-compress xz --sbat /tmp/sbat.csv --modules="${_GRUB_MODULES}" --fonts="unicode" --locales="en@quot" --themes="""
         #remove existing, else weird things are happening
         [[ -f "${DESTDIR}/${GRUB_PREFIX_DIR}/grub${_SPEC_UEFI_ARCH}.efi" ]] && rm ${DESTDIR}/${GRUB_PREFIX_DIR}/grub${_SPEC_UEFI_ARCH}.efi
         chroot "${DESTDIR}" grub-mkstandalone -d /usr/lib/grub/${_GRUB_ARCH}-efi -O ${_GRUB_ARCH}-efi ${_COMMON_GRUB_OPTIONS} -o "${GRUB_PREFIX_DIR}/grub${_SPEC_UEFI_ARCH}.efi" "boot/grub/grub.cfg=/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index 4077d316e..c0ebd1103 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -192,7 +192,7 @@ _uefi_GRUB_common() {
                         search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb \
                         usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard"
         # add -v for verbose
-        _COMMON_GRUB_OPTIONS="--compress xz --sbat /tmp/sbat.csv --modules="${_GRUB_MODULES}" --fonts="unicode" --locales="en@quot" --themes="""
+        _COMMON_GRUB_OPTIONS="--compress lzo --core-compress=xz --sbat /tmp/sbat.csv --modules="${_GRUB_MODULES}" --fonts="unicode" --locales="en@quot" --themes="""
 }
 
 # build grubXXX with all modules: http://bugs.archlinux.org/task/71382