From bbd4a183886120e39e74af0c4dba3dc781e24e4c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 28 Dec 2020 05:37:44 +0100 Subject: debian/preseed: manual partitioning --- roles/installer/debian/preseed/defaults/main.yml | 2 ++ roles/installer/debian/preseed/tasks/main.yml | 1 + roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 | 2 ++ roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 2 ++ 9 files changed, 17 insertions(+) (limited to 'roles') diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index 2ea95dda..b8d22ea6 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -20,6 +20,8 @@ preseed_virtual_machine: no preseed_no_splash: yes +preseed_manual_partitioning: no + preseed_efi_esp_size: 128M preseed_swraid_boot_size: 256M diff --git a/roles/installer/debian/preseed/tasks/main.yml b/roles/installer/debian/preseed/tasks/main.yml index cec5474e..525ba848 100644 --- a/roles/installer/debian/preseed/tasks/main.yml +++ b/roles/installer/debian/preseed/tasks/main.yml @@ -5,6 +5,7 @@ dest: "{{ preseed_tmpdir }}/preseed.cfg" - name: Generate partmam early-command script + when: not preseed_manual_partitioning template: src: "partman_early-command.sh.j2" dest: "{{ preseed_tmpdir }}/partman_early-command.sh" diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index f1fa03ad..3b240961 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -51,7 +51,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index bf312377..41e9d5ba 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -51,7 +51,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} 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 b8d792c6..1a3d6fd0 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -51,7 +51,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} 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 e6c3209c..f5227e54 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -51,7 +51,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} 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 b86cdc1b..a987a6c2 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -56,7 +56,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} 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 22845823..f33098a3 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -56,7 +56,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} 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 e9ac5d8c..ae4deeea 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -53,7 +53,9 @@ d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false +{% if not preseed_manual_partitioning %} {% include 'partman_config.j2' %} +{% endif %} {% if preseed_kernel_image is defined %} -- cgit v1.2.3