diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-07-06 00:27:29 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-07-06 00:27:29 +0200 |
| commit | 6ed9e671609ad2c4ca5199428db83269a0f53f61 (patch) | |
| tree | 9c4f9ef23cf96cd0193fb8123a5fa060ef704912 /roles/installer | |
| parent | ch-equinox-ws: install win32 (diff) | |
fix partman early-command for software-raid + efi case
Diffstat (limited to 'roles/installer')
| -rw-r--r-- | roles/installer/debian/preseed/templates/partman_early-command.sh.j2 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 b/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 index f13290e4..d974fd31 100644 --- a/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 +++ b/roles/installer/debian/preseed/templates/partman_early-command.sh.j2 @@ -6,17 +6,22 @@ umount -l /media || true {% if hostvars[install_hostname].install_cooked.disks.primary == "software-raid" %} disks="{% for disk in hostvars[install_hostname].install_cooked.disks.raid.members %}$(readlink -f {{ disk }}) {% endfor %}" +{% if (hostvars[install_hostname].install_cooked.efi | default(false)) %} +idx=1 +{% else %} +idx=0 +{% endif %} raid_members_boot="" raid_members_lvm="" for disk in $disks; do [ -n "$raid_members_boot" ] && raid_members_boot="$raid_members_boot#" [ -n "$raid_members_lvm" ] && raid_members_lvm="$raid_members_lvm#" if echo "$disk" | grep -Eq "/dev/(s|v)d[a-z]"; then - raid_members_boot="$raid_members_boot$disk"1 - raid_members_lvm="$raid_members_lvm$disk"2 + raid_members_boot="$raid_members_boot$disk"$((idx + 1)) + raid_members_lvm="$raid_members_lvm$disk"$((idx + 2)) else - raid_members_boot="$raid_members_boot$disk"p1 - raid_members_lvm="$raid_members_lvm$disk"p2 + raid_members_boot="$raid_members_boot$disk"p$((idx + 1)) + raid_members_lvm="$raid_members_lvm$disk"p$((idx + 2)) fi done raid_config="{{ hostvars[install_hostname].install_cooked.disks.raid.level }} {{ hostvars[install_hostname].install_cooked.disks.raid.members | length }} 0" |