1 files changed, 16 insertions, 14 deletions
diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
index aad183c7..eeda9943 100644
--- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
@@ -62,19 +62,20 @@ d-i partman/early_command string \
     debconf-set grub-installer/bootdev "$(readlink -f {{ hostvars[install_hostname].install_cooked.disks.primary }})"; \
     umount -l /media || true
 
-d-i grub-installer/choose_bootdev string manual
-d-i grub-installer/bootdev seen true
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman-md/device_remove_md boolean true
+d-i partman-md/confirm boolean true
+d-i partman-md/confirm_nooverwrite boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
 
 d-i partman-auto/method string lvm
 d-i partman-auto/purge_lvm_from_device boolean true
 d-i partman-auto-lvm/new_vg_name string {{ hostvars[install_hostname].host_name }}
 d-i partman-auto-lvm/guided_size string max
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto-lvm/no_boot boolean true
 
 {% if (hostvars[install_hostname].install_cooked.efi | default(false)) %}
 d-i partman-efi/non_efi_system boolean true
@@ -118,12 +119,16 @@ d-i partman-auto/expert_recipe string
                       lv_name{ dummy }                                                    \
               .
 
-d-i partman-auto-lvm/no_boot boolean true
 d-i partman-basicfilesystems/no_swap true
 d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
+
+
+## boot devices are configured by partman/early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev seen true
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean false
 
 
 d-i base-installer/install-recommends boolean false
@@ -135,9 +140,6 @@ d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
 d-i finish-install/reboot_in_progress note