From 1ed7a30854eb6eba67ef4c16d0823f2599f269af Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Wed, 20 Nov 2024 14:17:05 -0600
Subject: [PATCH] what is happening with my partitions

---
 .../archinstall/initialize_root_zvol.yaml      |  2 +-
 roles/base/tasks/archinstall/partition.yaml    | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/roles/base/tasks/archinstall/initialize_root_zvol.yaml b/roles/base/tasks/archinstall/initialize_root_zvol.yaml
index d7b9c41..1421e83 100644
--- a/roles/base/tasks/archinstall/initialize_root_zvol.yaml
+++ b/roles/base/tasks/archinstall/initialize_root_zvol.yaml
@@ -35,7 +35,7 @@
         -O canmount=off
         -O mountpoint=none
         -R /mnt
-        zroot {{ mirror }} {{ base_root_partitions | map('extract', partition_device_to_ids) | map('first') | flatten | list | join(' ') }}
+        zroot {{ mirror }} {{ base_root_partitions | map('extract', partition_device_to_ids) | map('first') | list | join(' ') }}
     vars:
       mirror: "{{ 'mirror' if base_root_partitions | length > 1 else '' }}"
   when: zroot_check.rc != 0
diff --git a/roles/base/tasks/archinstall/partition.yaml b/roles/base/tasks/archinstall/partition.yaml
index 608eb51..afb5fe3 100644
--- a/roles/base/tasks/archinstall/partition.yaml
+++ b/roles/base/tasks/archinstall/partition.yaml
@@ -27,20 +27,20 @@
     partition_ranges: >-
       {{
       (partition_ranges|d([])) + [{
-        'begin': base_root_partitions[:(loop_index|int)] | map(attribute='size_mib') | map('int') | sum(),
-        'end': base_root_partitions[:(loop_index|int+1)] | map(attribute='size_mib') | map('int') | sum(),
+        'begin': partitions[:(loop_index|int)] | map(attribute='size_mib') | map('int') | sum(),
+        'end': partitions[:(loop_index|int+1)] | map(attribute='size_mib') | map('int') | sum(),
         }]
       }}
+  with_sequence: start=0 end="{{ partitions | length - 1}}"
   vars:
     loop_index: "{{ item }}"
-    base_root_partitions:
+    partitions:
       - name: efi
         size_mib: "{{ base_root_efi_mib }}"
       - name: root
         size_mib: "{{ base_root_zpool_mib }}"
       - name: swap
         size_mib: "{{ base_root_swap_mib }}"
-  with_sequence: start=0 end="{{ base_root_partitions | length - 1}}"
 
 - debug:
     var: partition_ranges
@@ -51,6 +51,7 @@
     base_root_partitions: []
     base_swap_partitions: []
 
+#### efi/boot
 - name: Create EFI partition
   become: true
   vars:
@@ -74,9 +75,6 @@
   register: lsblk
   loop: "{{ parted_create.results | map(attribute='disk.dev') }}"
 
-- debug:
-    var: lsblk
-
 - name: Store EFI partition devices
   set_fact:
     base_efi_partitions: >-
@@ -88,6 +86,9 @@
   vars:
     part_index: 0
 
+- debug: var=base_efi_partitions
+
+#### zroot
 - name: Create root zvol partition
   become: true
   vars:
@@ -120,6 +121,9 @@
   vars:
     part_index: 1
 
+- debug: var=base_root_partitions
+
+#### swap
 - name: Create swap partition
   become: true
   vars: