more preseed file cleanups

7 files changed, 86 insertions, 74 deletions

diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster-with-raid.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster-with-raid.cfg.j2
index 7907928a..7b7cfd27 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-buster-with-raid.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-buster-with-raid.cfg.j2
@@ -47,18 +47,20 @@ d-i clock-setup/ntp boolean false
 
 d-i partman-auto/disk string /dev/sda /dev/sdb
 
-d-i partman-auto/method string raid
-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/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 raid
+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/choose_label string dos
 d-i partman/default_label string dos
 d-i partman-auto/choose_recipe select boot-root
@@ -110,8 +112,6 @@ d-i partman-auto-raid/recipe string \
 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
 
 
 d-i base-installer/install-recommends boolean false
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
index cf20410a..4bf945cc 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
@@ -51,19 +51,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
@@ -107,12 +108,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -123,6 +121,10 @@ d-i pkgsel/include string openssh-server python python-apt
 d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
index 3528d682..32e7467a 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -51,19 +51,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
@@ -107,12 +108,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -123,6 +121,10 @@ d-i pkgsel/include string openssh-server python python-apt
 d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 1b5245a1..0c6e9339 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -59,19 +59,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
@@ -115,12 +116,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -132,6 +130,10 @@ d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
index ca018fd2..c2d2324f 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
@@ -59,19 +59,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
@@ -115,12 +116,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -132,6 +130,10 @@ d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index cdb5f966..889f33d9 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -56,19 +56,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
@@ -112,12 +113,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -129,6 +127,10 @@ d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
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..dd066085 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,9 @@ 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
 
 
 d-i base-installer/install-recommends boolean false
@@ -135,6 +133,10 @@ d-i pkgsel/upgrade select safe-upgrade
 popularity-contest popularity-contest/participate boolean false
 d-i pkgsel/update-policy select none
 
+
+## grub-installer/bootdev is set by early_command
+d-i grub-installer/bootdev seen true
+d-i grub-installer/choose_bootdev string manual
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false