diff options
author | Christian Pointner <equinox@spreadspace.org> | 2020-06-28 22:45:16 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-01 11:37:40 +0200 |
commit | 21b68833f431ca3569a5cbc41564bef2f2f32761 (patch) | |
tree | bcdbcf1f4aa6c1d2a4024c5bd0c1141af75b45fb /roles/installer/debian/preseed/templates/partman_config.j2 | |
parent | increase timeout for cloud install (diff) |
another attempt to fix the partman recipe
Diffstat (limited to 'roles/installer/debian/preseed/templates/partman_config.j2')
-rw-r--r-- | roles/installer/debian/preseed/templates/partman_config.j2 | 50 |
1 files changed, 38 insertions, 12 deletions
diff --git a/roles/installer/debian/preseed/templates/partman_config.j2 b/roles/installer/debian/preseed/templates/partman_config.j2 index 27dff5e2..ebaf180e 100644 --- a/roles/installer/debian/preseed/templates/partman_config.j2 +++ b/roles/installer/debian/preseed/templates/partman_config.j2 @@ -1,7 +1,4 @@ -d-i partman/early_command string \ - debconf-set partman-auto/disk "$(readlink -f {{ hostvars[install_hostname].install_cooked.disks.primary }})"; \ - debconf-set grub-installer/bootdev "$(readlink -f {{ hostvars[install_hostname].install_cooked.disks.primary }})"; \ - umount -l /media || true +d-i partman/early_command string /partman_early-command.sh d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -12,7 +9,11 @@ d-i partman-lvm/device_remove_lvm boolean true d-i partman-lvm/confirm boolean true d-i partman-lvm/confirm_nooverwrite boolean true +{% if hostvars[install_hostname].install_cooked.disks.primary == "software-raid" %} +d-i partman-auto/method string raid +{% else %} d-i partman-auto/method string lvm +{% endif %} 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 @@ -22,44 +23,69 @@ d-i partman-auto-lvm/no_boot boolean true d-i partman-efi/non_efi_system boolean true d-i partman/choose_label string gpt d-i partman/default_label string gpt +{% else %} +d-i partman/choose_label string dos +d-i partman/default_label string dos {% endif %} + +d-i partman-auto/choose_recipe select ansible d-i partman-auto/expert_recipe string \ - boot-root :: \ + ansible :: \ {% if (hostvars[install_hostname].install_cooked.efi | default(false)) %} 100 100 128 fat16 \ $defaultignore{ } $primary{ } $bootable{ } \ method{ efi } format{ } \ . \ {% endif %} +{% if hostvars[install_hostname].install_cooked.disks.primary == "software-raid" %} + 256 10000 256 raid \ + $lvmignore{ } $primary{ } method{ raid } \ + . \ + 1000 10000 -1 raid \ + $lvmignore{ } $primary{ } method{ raid } \ + . \ +{% endif %} 1000 10000 -1 ext4 \ $defaultignore{ } $primary{ } $bootable{ } \ method{ lvm } vg_name{ {{ hostvars[install_hostname].host_name }} } \ . \ - 2048 10000 2560 ext4 \ - $lvmok{ } in_vg{ {{ hostvars[install_hostname].host_name }} } \ + 2560 10000 2560 ext4 \ + $defaultignore{ } $lvmok{ } \ + in_vg{ {{ hostvars[install_hostname].host_name }} } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ . \ - 1024 11000 1280 ext4 \ - $lvmok{ } in_vg{ {{ hostvars[install_hostname].host_name }} } \ + 1280 10000 1280 ext4 \ + $defaultignore{ } $lvmok{ } \ + in_vg{ {{ hostvars[install_hostname].host_name }} } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \ . \ 768 10000 768 ext4 \ - $lvmok{ } in_vg{ {{ hostvars[install_hostname].host_name }} } \ + $defaultignore{ } $lvmok{ } \ + in_vg{ {{ hostvars[install_hostname].host_name }} } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var/log } \ - options/nodev{ nodev } options/noatime{ noatime } \ + options/nodev{ nodev } \ + options/noatime{ noatime } \ options/noexec{ noexec } \ . \ 16 20000 -1 ext4 \ - $lvmok{ } in_vg{ {{ hostvars[install_hostname].host_name }} } \ + $defaultignore{ } $lvmok{ } \ + in_vg{ {{ hostvars[install_hostname].host_name }} } \ lv_name{ dummy } \ . + d-i partman-basicfilesystems/no_swap true d-i partman-partitioning/confirm_write_new_label boolean true d-i partman/choose_partition select finish + + +## boot devices are configured by partman/early_command +d-i grub-installer/bootdev seen true +d-i grub-installer/only_debian boolean true +d-i grub-installer/with_other_os boolean false |