From 0b11c5f77323f72fb56f8dc217c726133860f1f9 Mon Sep 17 00:00:00 2001
From: Mitchell Riedstra <mitch@riedstra.dev>
Date: Fri, 5 Sep 2025 17:38:13 -0400
Subject: Pull in some stuff from releng and add some AUR packages.

---
 .../airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook | 13 +++++++++++++
 .../zzzz99-remove-custom-hooks-from-airootfs.hook      | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 archiso_config/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
 create mode 100644 archiso_config/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook

(limited to 'archiso_config/airootfs/etc/pacman.d')

diff --git a/archiso_config/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/archiso_config/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
new file mode 100644
index 0000000..342aa95
--- /dev/null
+++ b/archiso_config/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
@@ -0,0 +1,13 @@
+# remove from airootfs!
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = pacman-mirrorlist
+
+[Action]
+Description = Uncommenting all mirrors in /etc/pacman.d/mirrorlist...
+When = PostTransaction
+Depends = pacman-mirrorlist
+Depends = sed
+Exec = /usr/bin/sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
diff --git a/archiso_config/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook b/archiso_config/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
new file mode 100644
index 0000000..8dfb943
--- /dev/null
+++ b/archiso_config/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
@@ -0,0 +1,18 @@
+# remove from airootfs!
+# As a workaround for https://bugs.archlinux.org/task/49347 , remove pacman hooks specific to the ISO build process.
+# If not, they would be used when pacstrap is run in the live environment.
+
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Type = Package
+Target = *
+
+[Action]
+Description = Work around FS#49347 by removing custom pacman hooks that are only required during ISO build...
+When = PostTransaction
+Depends = sh
+Depends = coreutils
+Depends = grep
+Exec = /bin/sh -c "rm -- $(grep -Frl 'remove from airootfs' /etc/pacman.d/hooks/)"
-- 
cgit v1.2.3