move some things, add more packages, successfully re-provisioned loki

roles/base/tasks/archinstall/install_os.yaml

@@ -16,6 +16,7 @@
       - base-devel
       - efibootmgr
       - git
+      - git
       - iwd
       - linux-firmware
       - linux-lts

roles/base/tasks/archinstall/partition.yaml

@@ -6,6 +6,11 @@
   register: base_root_disks_info
   loop: "{{ base_root_disks | list }}"
 
+- name: partition | ensure efi is not mounted
+  mount:
+    path: /mnt/boot/efi
+    state: unmounted
+
 - name: Calculate maximum usable disk space
   ansible.builtin.set_fact:
     base_root_usable_mib: "{{ (base_root_disks_info.results | map(attribute='disk.size') | min | int) - 1 }}"
@@ -121,8 +126,6 @@
   vars:
     part_index: 1
 
-- debug: var=base_root_partitions
-
 #### swap
 - name: Create swap partition
   become: true
@@ -145,6 +148,7 @@
   shell: "lsblk -r --noheadings -o PATH {{ item }} | sort"
   register: lsblk
   loop: "{{ parted_create.results | map(attribute='disk.dev') }}"
+  when: base_root_swap_mib is defined and base_root_swap_mib|int > 0
 
 - name: Store swap partition devices
   set_fact:

roles/base/tasks/archinstall/prepare_chroot.yaml

@@ -13,6 +13,8 @@
     - /etc/zfs
     - /boot/efi
 
+- debug: var=base_efi_partitions
+
 - name: Mount EFI
   ansible.posix.mount:
     path: /mnt/boot/efi

roles/base/tasks/main.yaml

@@ -12,5 +12,4 @@
   - import_tasks: archinstall/prepare_chroot.yaml
   - import_tasks: archinstall/install_os.yaml
   - import_tasks: archinstall/postinstall_snapshot.yaml
-  - meta: end_play # pull again after reboot to resume provisioning
   when: archiso_detected and base_root_disks is defined