From 33e3ebea6f1fbae3d77ccb7cc27360fccf288a59 Mon Sep 17 00:00:00 2001 From: hygienic-books Date: Wed, 9 Apr 2025 03:15:02 +0200 Subject: [PATCH] refactor(role): Move pacman pkg cache underneath boot dataset --- tasks/archlinux-zfs-pacman-cache.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/archlinux-zfs-pacman-cache.yml b/tasks/archlinux-zfs-pacman-cache.yml index fb8152f..fd1add7 100644 --- a/tasks/archlinux-zfs-pacman-cache.yml +++ b/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