From 45939dc97cadb05502aecb027478f2fca13a9673 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 6 Aug 2023 11:44:26 +0200
Subject: [PATCH] add progressbar on grub

---
 usr/lib/archboot/installer/bootloader.sh | 28 ++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh
index e103e8073..1f8d3386a 100644
--- a/usr/lib/archboot/installer/bootloader.sh
+++ b/usr/lib/archboot/installer/bootloader.sh
@@ -857,6 +857,20 @@ _do_grub_bios() {
     fi
 }
 
+_grub_install() {
+    chroot "${_DESTDIR}" grub-install \
+        --directory="/usr/lib/grub/${_GRUB_ARCH}-efi" \
+        --target="${_GRUB_ARCH}-efi" \
+        --efi-directory="/${_UEFISYS_MP}" \
+        --bootloader-id="grub" \
+        --boot-directory="/boot" \
+        --no-nvram \
+        --recheck \
+        --debug &> "/tmp/grub_uefi_${_UEFI_ARCH}_install.log"
+    cat "/tmp/grub_uefi_${_UEFI_ARCH}_install.log" >>"${_LOG}"
+    rm /.archboot
+}
+
 _setup_grub_uefi() {
     _do_uefi_common || return 1
     [[ "${_UEFI_ARCH}" == "X64" ]] && _GRUB_ARCH="x86_64"
@@ -873,18 +887,10 @@ _setup_grub_uefi() {
         cp -f /usr/share/archboot/bootloader/mm"${_SPEC_UEFI_ARCH}".efi "${_DESTDIR}"/"${_UEFISYS_MP}"/EFI/BOOT/
         _GRUB_PREFIX_DIR="${_UEFISYS_MP}/EFI/BOOT/"
     else
-        _progress "50" "Setting up GRUB(2) UEFI..."
         ## Install GRUB
-        chroot "${_DESTDIR}" grub-install \
-            --directory="/usr/lib/grub/${_GRUB_ARCH}-efi" \
-            --target="${_GRUB_ARCH}-efi" \
-            --efi-directory="/${_UEFISYS_MP}" \
-            --bootloader-id="grub" \
-            --boot-directory="/boot" \
-            --no-nvram \
-            --recheck \
-            --debug &> "/tmp/grub_uefi_${_UEFI_ARCH}_install.log"
-        cat "/tmp/grub_uefi_${_UEFI_ARCH}_install.log" >>"${_LOG}"
+        touch /.archboot
+        _grub_install &
+        _progress_wait "50" "99" "Setting up GRUB(2) UEFI..." "0.1"
         _GRUB_PREFIX_DIR="/boot/grub/"
     fi
     _chroot_umount