diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-07-04 23:26:09 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-04 23:26:09 +0200 |
| commit | ceafa5b30eec02940c6a62526fa81c09d40b1b59 (patch) | |
| tree | af076e4a9d7441cb051cafe600e85dd7274188f9 /roles/cloud/install/templates/hetzner_installimage.conf.j2 | |
| parent | move usb install role to installer/debian/ (diff) | |
| parent | install/preseed: convert old host configs to new partman layout (diff) | |
Merge branch 'topic/preseed-configurable-disk-layout-contd'
Diffstat (limited to 'roles/cloud/install/templates/hetzner_installimage.conf.j2')
| -rw-r--r-- | roles/cloud/install/templates/hetzner_installimage.conf.j2 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/roles/cloud/install/templates/hetzner_installimage.conf.j2 b/roles/cloud/install/templates/hetzner_installimage.conf.j2 index ed22f286..e3cd4c4e 100644 --- a/roles/cloud/install/templates/hetzner_installimage.conf.j2 +++ b/roles/cloud/install/templates/hetzner_installimage.conf.j2 @@ -13,12 +13,14 @@ DRIVE1 {{ install_cooked.disks.primary }} DRIVE1 /dev/sda {% endif %} BOOTLOADER grub -PART /boot ext4 512M -PART lvm {{ host_name }} {{ install_cooked.disks.root_lvm_size }} -{% if install_cooked.disks.root_lvm_size != "all" %} +PART /boot ext4 {{ hetzner_boot_size }} +{% set system_lvm_size = install_cooked.system_lvm.size | default(hetzner_system_lvm_size_default) %} +PART lvm {{ host_name }} {{ system_lvm_size }} +{% if system_lvm_size != "all" %} PART /dummy ext4 all {% endif %} -LV {{ host_name }} root / ext4 2560M -LV {{ host_name }} var /var ext4 1280M -LV {{ host_name }} var+log /var/log ext4 768M +{% set system_lvm_volumes = install_cooked.system_lvm.volumes | default(hetzner_system_lvm_volumes_default) %} +{% for volume in system_lvm_volumes %} +LV {{ host_name }} {{ volume.name }} {{ volume.mountpoint }} {{ volume.filesystem }} {{ volume.size }} +{% endfor %} IMAGE {{ latest_image.stdout }} |