From da3e75d4894ba75748bd37c33dd476d9baa00dfc Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Wed, 20 Nov 2024 15:11:31 -0600
Subject: [PATCH] end play after archinstall, sort lsblk calls sort partition
 order makes sense

---
 inventory/host_vars/hulder.yaml              | 1 +
 local.yml                                    | 4 ----
 playbooks/install.yaml                       | 5 +++++
 roles/base/tasks/archinstall/install_os.yaml | 1 +
 roles/base/tasks/archinstall/partition.yaml  | 7 ++++---
 roles/base/tasks/main.yaml                   | 1 +
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/inventory/host_vars/hulder.yaml b/inventory/host_vars/hulder.yaml
index e0fe751..ead4b07 100644
--- a/inventory/host_vars/hulder.yaml
+++ b/inventory/host_vars/hulder.yaml
@@ -1,5 +1,6 @@
 ---
 ansible_user: root
+ansible_host: 10.4.0.49
 
 base_root_swap_mib: "{{ 1024 * 16 }}"
 base_root_efi_mib: 512
diff --git a/local.yml b/local.yml
index 2b060a4..1aa4698 100644
--- a/local.yml
+++ b/local.yml
@@ -1,6 +1,2 @@
 ---
-- hosts: all
-  roles:
-    - detect_archiso 
-
 - import_playbook: playbooks/install.yaml
diff --git a/playbooks/install.yaml b/playbooks/install.yaml
index fb4bf50..05777db 100644
--- a/playbooks/install.yaml
+++ b/playbooks/install.yaml
@@ -9,3 +9,8 @@
   tags: base
   roles:
     - base
+
+# - name: install minimal system packages
+#   hosts: base
+#   roles:
+#     - packages_minimal
diff --git a/roles/base/tasks/archinstall/install_os.yaml b/roles/base/tasks/archinstall/install_os.yaml
index 16a542b..2f84edb 100644
--- a/roles/base/tasks/archinstall/install_os.yaml
+++ b/roles/base/tasks/archinstall/install_os.yaml
@@ -11,6 +11,7 @@
   shell: "pacstrap /mnt {{ packages | join(' ') }}"
   vars:
     packages:
+      - ansible
       - base
       - base-devel
       - efibootmgr
diff --git a/roles/base/tasks/archinstall/partition.yaml b/roles/base/tasks/archinstall/partition.yaml
index 70900d9..4bf1f56 100644
--- a/roles/base/tasks/archinstall/partition.yaml
+++ b/roles/base/tasks/archinstall/partition.yaml
@@ -71,7 +71,7 @@
   register: parted_create
 
 - name: Collect EFI partition devices
-  command: "lsblk -r --noheadings -o PATH {{ item }}"
+  shell: "lsblk -r --noheadings -o PATH {{ item }} | sort"
   register: lsblk
   loop: "{{ parted_create.results | map(attribute='disk.dev') }}"
 
@@ -106,7 +106,7 @@
   register: parted_create
 
 - name: Collect root zvol partition devices
-  command: "lsblk -r --noheadings -o PATH {{ item }}"
+  shell: "lsblk -r --noheadings -o PATH {{ item }} | sort"
   register: lsblk
   loop: "{{ parted_create.results | map(attribute='disk.dev') }}"
 
@@ -142,7 +142,7 @@
   when: base_root_swap_mib is defined and base_root_swap_mib|int > 0
 
 - name: Collect swap partition devices
-  command: "lsblk -r --noheadings -o PATH {{ item }}"
+  shell: "lsblk -r --noheadings -o PATH {{ item }} | sort"
   register: lsblk
   loop: "{{ parted_create.results | map(attribute='disk.dev') }}"
 
@@ -156,6 +156,7 @@
   loop: "{{ lsblk.results | map(attribute='stdout_lines') | sort }}"
   vars:
     part_index: 2
+  when: base_root_swap_mib is defined and base_root_swap_mib|int > 0
 
 - name: Analyze resulting partition layouts
   parted:
diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml
index dc00005..fe3fb7d 100644
--- a/roles/base/tasks/main.yaml
+++ b/roles/base/tasks/main.yaml
@@ -8,4 +8,5 @@
   - import_tasks: archinstall/prepare_chroot.yaml
   - import_tasks: archinstall/install_os.yaml
   - import_tasks: archinstall/postinstall_snapshot.yaml
+  - meta: end_play
   when: archiso_detected and base_root_disks is defined