From 06823044ddae087dceab435c5025fbe129a43334 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Tue, 17 Jun 2025 03:57:58 +0200
Subject: [PATCH] Update ubuntu to plucky release

---
 README.md                        |  2 +-
 roles/bootstrap/tasks/main.yml   |  2 +-
 roles/environment/tasks/main.yml | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index db8316c..906a1b8 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ This playbook supports multiple Linux distributions with specific versions tailo
 | rhel9      | Red Hat Enterprise Linux 9         |
 | rhel10     | Red Hat Enterprise Linux 10        |
 | rocky      | Rocky Linux 9.x                    |
-| ubuntu     | Ubuntu 24.10 (Oracular Oriole)     |
+| ubuntu     | Ubuntu 25.04 (Plucky Puffin)       |
 | ubuntu-lts | Ubuntu 24.04 LTS (Noble Numbat)    |
 
 # Documentation
diff --git a/roles/bootstrap/tasks/main.yml b/roles/bootstrap/tasks/main.yml
index 74964e0..8a06449 100644
--- a/roles/bootstrap/tasks/main.yml
+++ b/roles/bootstrap/tasks/main.yml
@@ -24,7 +24,7 @@
       changed_when: result.rc == 0
       register: result
       with_items:
-        - debootstrap --include={{ vars[os].base | join(',') }} {{ 'oracular' if os == 'ubuntu' else 'noble' }}
+        - debootstrap --include={{ vars[os].base | join(',') }} {{ 'plucky' if os == 'ubuntu' else 'noble' }}
           /mnt http://archive.ubuntu.com/ubuntu/
         - ln -sf /run/NetworkManager/resolv.conf /mnt/etc/resolv.conf
         - arch-chroot /mnt sed -i '1s|$| universe|' /etc/apt/sources.list
diff --git a/roles/environment/tasks/main.yml b/roles/environment/tasks/main.yml
index 22a863a..1985c39 100644
--- a/roles/environment/tasks/main.yml
+++ b/roles/environment/tasks/main.yml
@@ -81,6 +81,22 @@
       ansible.builtin.wait_for:
         timeout: 15
 
+    - name: Setup Pacman
+      community.general.pacman:
+        update_cache: true
+        force: true
+        name: "{{ item.name }}"
+        state: latest
+      loop:
+        - { name: glibc }
+        - { name: dnf, os: [almalinux, fedora, rhel8, rhel9, rhel10, rocky] }
+        - { name: debootstrap, os: [debian11, debian12, ubuntu, ubuntu-lts] }
+        - { name: debian-archive-keyring, os: [debian11, debian12] }
+        - { name: ubuntu-keyring, os: [ubuntu, ubuntu-lts] }
+      when: "'os' not in item or os in item.os"
+      retries: 4
+      delay: 15
+
     - name: Prepare /iso mount and repository for RHEL-based systems
       when: os | lower in ["rhel8", "rhel9", "rhel10"]
       block: