From 30bd9405366b30384cd998c3d7a7b2e163d73c5a Mon Sep 17 00:00:00 2001
From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 13 Feb 2022 22:09:21 +0100
Subject: [PATCH] another try

---
 bootstrap.sh      | 18 ++++++++++--------
 files/boot.sh     |  6 +++---
 files/options.sh  |  3 +++
 files/preseed.cfg |  4 ++--
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100755 files/options.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 874435d..ca7ded5 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -142,7 +142,9 @@ build_di_stick()
         sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
         sudo rm -rf initrd/lib/modules/*
         sudo cp -a testing/lib/modules/* initrd/lib/modules/
-        sudo cp ../files/preseed.cfg initrd/
+        sudo cp ../files/options.sh initrd/usr/lib/base-installer.d/
+        sudo cp ../files/wifi.sh initrd/usr/lib/debian-installer-startup.d/
+        sudo cp ../files/boot.sh initrd/usr/lib/finish-install.d/
         sudo cp ../files/wpa.conf initrd/etc/
         (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
         sudo rm -rf initrd
@@ -175,11 +177,11 @@ cd build
 
 sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support
 
-build_linux
-build_m1n1
-build_uboot
-build_rootfs
-build_live_stick
+# build_linux
+# build_m1n1
+# build_uboot
+# build_rootfs
+# build_live_stick
 build_di_stick
-build_dd
-upload_artefacts
+# build_dd
+# upload_artefacts
diff --git a/files/boot.sh b/files/boot.sh
index aeb54ff..250e5ae 100755
--- a/files/boot.sh
+++ b/files/boot.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-chroot /target debconf-set-selections < /options
 chroot /target apt-get remove grub-efi-arm64-signed
-chroot /target grub-install --removable /boot/efi
+rm /target/boot/efi/EFI/BOOT/fbaa64.efi
+rm /target/boot/efi/EFI/debian/fbaa64.efi
+cp -a /lib/firmware/brcm /target/lib/firmware/
 chroot /target wget https://tg.st/u/k.deb
 chroot /target dpkg -i k.deb
 chroot /target rm k.deb
-cp -a /lib/firmware/brcm /target/lib/firmware/
 chroot /target update-grub
diff --git a/files/options.sh b/files/options.sh
new file mode 100755
index 0000000..e798b82
--- /dev/null
+++ b/files/options.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+chroot /target debconf-set-selections < /options
diff --git a/files/preseed.cfg b/files/preseed.cfg
index b3b0716..d191c0a 100644
--- a/files/preseed.cfg
+++ b/files/preseed.cfg
@@ -1,2 +1,2 @@
-d-i base-installer/kernel/image string none
-d-i preseed/early_command /wifi.sh
+grub-efi-arm64  grub2/update_nvram      boolean false
+grub-efi-arm64  grub2/force_efi_extra_removable boolean false
-- 
2.39.5