From d8b54c61be578d11f845f7bb78a0aef2ad5d4828 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 28 Mar 2025 01:37:31 +0100
Subject: [PATCH] Improve pre-seeding script.

---
 bookworm/preseed.cfg               | 7 +++++++
 bookworm/scripts/update_preseed.sh | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/bookworm/preseed.cfg b/bookworm/preseed.cfg
index 3a96114..4b7e4f3 100644
--- a/bookworm/preseed.cfg
+++ b/bookworm/preseed.cfg
@@ -5,8 +5,11 @@ user-setup-udeb	passwd/make-user boolean false
 
 d-i netcfg/choose_interface select auto
 d-i netcfg/link_wait_timeout string 3
+d-i netcfg/wireless_security_type wpa
 #d-i netcfg/wireless_wep string
 #d-i netcfg/disable_autoconfig boolean false
+d-i netcfg/use_autoconfig true
+d-i netcfg/wireless_essid kadatheron
 d-i netcfg/get_hostname string unassigned-hostname
 d-i netcfg/get_domain string unassigned-domain
 
@@ -17,6 +20,7 @@ d-i partman-auto-crypto/erase_disks boolean false
 # d-i partman-lvm/confirm boolean true
 
 d-i base-installer/kernel/image string linux-image-amd64
+d-i base-installer/initramfs-tools/driver-policy most
 
 # d-i pkgsel/run_tasksel boolean false
 
@@ -25,8 +29,11 @@ d-i mirror/protocol string http
 d-i apt-setup/non-free-firmware boolean true
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
+d-i apt-setup/services-select security, updates
 
 # d-i grub-installer/only_debian boolean true
+grub-installer/enable_os_prober_otheros_no false
+grub-installer/force-efi-extra-removable false
 
 clock-setup clock-setup/utc boolean true
 d-i finish-install/reboot_in_progress note
diff --git a/bookworm/scripts/update_preseed.sh b/bookworm/scripts/update_preseed.sh
index 9fb5113..b0572bc 100755
--- a/bookworm/scripts/update_preseed.sh
+++ b/bookworm/scripts/update_preseed.sh
@@ -10,6 +10,8 @@ abort_if_not_user root
 expect_min_n_args 1 '(e.g. "sdb1")' $@
 PATH_STICK="$(get_mountable_device_path $1)"
 
+echo "Mounting ${PATH_STICK} …"
 mount "${PATH_STICK}" "${PATH_MNT_STICK}"
-trap "umount ${PATH_MNT_STICK}" EXIT INT TERM
+trap "echo 'Unmounting'; umount ${PATH_MNT_STICK}" EXIT INT TERM
+echo "Copying ${PATH_PRESEED_CFG} …"
 cp "${PATH_PRESEED_CFG}" "${PATH_MNT_STICK}/"
-- 
2.30.2