another try with the debian installer

diff --git a/bootstrap.sh b/bootstrap.sh
index ca7ded5094f465023cc3ceb65da34d00af4fe9e3..a4bf7af63cd36803f8092d729db95382ed6f6350 100644 (file)
--- 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 250e5ae4d7076634f76e2bf6b9beeee3e35c722a..20d0e2767466af66dd5c94e915b64d68a6abbb6e 100755 (executable)
--- 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 (executable)
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 (file)
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