From 81a7fcd64c5a867dd3f47a79c0eff6131092875a Mon Sep 17 00:00:00 2001
From: hygienic-books <hygienic-books@tentic.net>
Date: Fri, 27 Oct 2023 00:23:33 +0200
Subject: [PATCH] fix(zbm): ZBM now comes with an EFI stub loader file, we use
 that (#5)

---
 setup.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/setup.sh b/setup.sh
index 2615583..375025c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -671,12 +671,11 @@ EFI:
   ImageDir: /efi/EFI/ZBM
   Versions: false
   Enabled: true
-  Stub: /etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub
+  Stub: /usr/share/zfsbootmenu/stubs/linuxx64.efi.stub  # workaround: https://github.com/zbm-dev/zfsbootmenu/discussions/501
 Kernel:
   CommandLine: ro loglevel=0 zbm.import_policy=hostid
   Prefix: vmlinuz
 EOF
-        get_known_good_stub_loader
     else
         configure_syslinux
         cat > '/etc/zfsbootmenu/config.yaml' <<EOF
@@ -701,14 +700,6 @@ EOF
     zfs set org.zfsbootmenu:commandline='rw nowatchdog rd.vconsole.keymap=de-latin1' "${zpool_name}"'/root/'"${zfs_arch_dataset_name}"
 }
 
-function get_known_good_stub_loader () {
-    local known_good_stub_loader local_stub_loader_abs
-    known_good_stub_loader='https://github.com/zbm-dev/zfsbootmenu/raw/master/testing/stubs/linuxx64.efi.stub'
-    local local_stub_loader_abs='/etc/zfsbootmenu/stub-loader.d/linuxx64.efi.stub'
-    mkdir -p "$(dirname "${local_stub_loader_abs}")"
-    curl --silent --location "${known_good_stub_loader}" --output "${local_stub_loader_abs}"
-}
-
 function add_syslinux_pacman_hook () {
     mkdir -p '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main'
     git -C '/opt/git/quico.space/quico-os-setup/zbm-syslinux-pacman-hook/branches/main' clone 'https://quico.space/quico-os-setup/zbm-syslinux-pacman-hook.git' .