fix(role): Add pacman options to correct config section

Without an [options] or similar INI header line pacman config files
in '/etc/pacman.d' can sometimes load incorrectly, for example when
multiple files exist where some of them do and other do not have the
header. We're normalizing our config file here so that it no longer
trips up pacman.

files/etc/pacman.d/pacman.conf

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: MIT
+[options]
 ILoveCandy
 Color
 ParallelDownloads = 20
- NoExtract = etc/pacman.d/mirrorlist
+NoExtract = etc/pacman.d/mirrorlist

tasks/archlinux-auto-updates.yml

@@ -38,24 +38,28 @@
     repo: '{{ genvm_os_auto_upgrades_git_repo }}'
     dest: '{{ genvm_os_auto_upgrades_git_clone_dir }}'
     version: '{{ genvm_os_auto_upgrades_git_branch }}'
+
+- name: 'If Arch Linux copy systemd unit files for OS auto-upgrades to ''/etc/systemd/system'''
+  when: 'ansible_facts[''os_family''] | lower == ''archlinux'''
+  loop_control:
+    loop_var: 'genvm_os_auto_upgrades_unit'
+    label: 'Copy ''{{ genvm_os_auto_upgrades_unit.source | basename }}'' to ''/etc/systemd/system'''
+  loop:
+    - { source: '{{ genvm_os_auto_upgrades_git_clone_dir }}/arch-linux-update-and-restart.service', target: '/etc/systemd/system/arch-linux-update-and-restart.service' }
+    - { source: '{{ genvm_os_auto_upgrades_git_clone_dir }}/arch-linux-update-and-restart.timer', target: '/etc/systemd/system/arch-linux-update-and-restart.timer' }
+  ansible.builtin.copy:
+    src: '{{ genvm_os_auto_upgrades_unit.source }}'
+    dest: '{{ genvm_os_auto_upgrades_unit.target }}'
+    remote_src: true
   notify:
     - 'Reload systemd unit configs'
 
-- name: 'If Arch Linux create symlinks to repo for OS auto-upgrades'
-  when: 'ansible_facts[''os_family''] | lower == ''archlinux'''
-  loop_control:
-    loop_var: 'genvm_os_auto_upgrades_symlink'
-    label: 'Create symlink to ''{{ genvm_os_auto_upgrades_symlink.target | basename }}'''
-  loop:
-    - { target: '{{ genvm_os_auto_upgrades_git_clone_dir }}/arch-linux-update-and-restart.service', symlink: '/etc/systemd/system/arch-linux-update-and-restart.service' }
-    - { target: '{{ genvm_os_auto_upgrades_git_clone_dir }}/arch-linux-update-and-restart.timer', symlink: '/etc/systemd/system/arch-linux-update-and-restart.timer' }
-  ansible.builtin.file:
-    src: '{{ genvm_os_auto_upgrades_symlink.target }}'
-    dest: '{{ genvm_os_auto_upgrades_symlink.symlink }}'
-    state: 'link'
-    force: true
-  notify:
-    - 'Reload systemd unit configs'
+# Chances are we've just updated systemd unit files in '/etc/systemd/system'. In
+# a second we'll be enabling a timer unit that was among those files we just
+# (potentially) changed. We should flush our handlers now, i.e. 'systemctl
+# daemon-reload' to make sure systemd knows the newest state of our units.
+- name: 'Flush handlers'
+  meta: flush_handlers
 
 - name: 'If Arch Linux enable systemd timer for OS auto-upgrades'
   ansible.builtin.systemd_service:

tasks/archlinux-zfs-pacman-cache.yml

@@ -12,7 +12,7 @@
   changed_when: false
   failed_when: false
   ansible.builtin.shell: |
-    zfs list zpool/data/var/cache/pacman/pkg
+    zfs list zpool/root/archlinux/var/cache/pacman/pkg
     
 - name: 'If no pacman cache dataset exists create dataset'
   when: 'genvm_archlinux_zfs_pacman_cache_zfs_has_pacman_cache_dataset.rc > 0'
@@ -20,9 +20,9 @@
   changed_when: 'genvm_archlinux_zfs_pacman_cache_pacman_cache_dir_was_temp_moved.rc == 0'
   ansible.builtin.shell: |
     mv '/var/cache/pacman/pkg'{,'.bak'} && \
-    if ! zfs list zpool/data/var &>/dev/null; then zfs create -o canmount=off zpool/data/var; fi && \
-    if ! zfs list zpool/data/var/cache &>/dev/null; then zfs create -o canmount=off zpool/data/var/cache; fi && \
-    if ! zfs list zpool/data/var/cache/pacman &>/dev/null; then zfs create -o canmount=off zpool/data/var/cache/pacman; fi && \
-    zfs create zpool/data/var/cache/pacman/pkg && \
+    if ! zfs list zpool/root/archlinux/var &>/dev/null; then zfs create -o canmount=off zpool/root/archlinux/var; fi && \
+    if ! zfs list zpool/root/archlinux/var/cache &>/dev/null; then zfs create -o canmount=off zpool/root/archlinux/var/cache; fi && \
+    if ! zfs list zpool/root/archlinux/var/cache/pacman &>/dev/null; then zfs create -o canmount=off zpool/root/archlinux/var/cache/pacman; fi && \
+    zfs create zpool/root/archlinux/var/cache/pacman/pkg && \
     rsync -a --remove-source-files '/var/cache/pacman/pkg'{'.bak',}'/' && \
     find '/var/cache/pacman/pkg.bak' -type d -empty -delete