From 4acf5b00d96a40ef3ccdc01ad4d42b2da061d897 Mon Sep 17 00:00:00 2001 From: Thomas Glanzmann Date: Sun, 13 Feb 2022 22:31:09 +0100 Subject: [PATCH] another try with the debian installer --- bootstrap.sh | 6 ++---- files/boot.sh | 2 ++ files/options.sh | 3 --- files/preseed.cfg | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) delete mode 100755 files/options.sh delete mode 100644 files/preseed.cfg diff --git a/bootstrap.sh b/bootstrap.sh index ca7ded5..a4bf7af 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -142,10 +142,8 @@ 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/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/ + sudo cp ../files/wifi.sh initrd/ + sudo cp ../files/boot.sh initrd/ (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz) sudo rm -rf initrd cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi diff --git a/files/boot.sh b/files/boot.sh index 250e5ae..20d0e27 100755 --- a/files/boot.sh +++ b/files/boot.sh @@ -1,5 +1,7 @@ #!/bin/sh +echo 'grub-efi-arm64 grub2/update_nvram boolean false' | chroot /target debconf-set-selections +echo 'grub-efi-arm64 grub2/force_efi_extra_removable boolean false' | chroot /target debconf-set-selections chroot /target apt-get remove grub-efi-arm64-signed rm /target/boot/efi/EFI/BOOT/fbaa64.efi rm /target/boot/efi/EFI/debian/fbaa64.efi diff --git a/files/options.sh b/files/options.sh deleted file mode 100755 index e798b82..0000000 --- a/files/options.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -chroot /target debconf-set-selections < /options diff --git a/files/preseed.cfg b/files/preseed.cfg deleted file mode 100644 index d191c0a..0000000 --- a/files/preseed.cfg +++ /dev/null @@ -1,2 +0,0 @@ -grub-efi-arm64 grub2/update_nvram boolean false -grub-efi-arm64 grub2/force_efi_extra_removable boolean false -- 2.39.5