Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng/airootfs
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-01-27 19:10:01 +0200
committernl6720 <nl6720@gmail.com>2021-01-31 09:55:25 +0200
commita46c74087fe91c35589dcf1082128e282ad8c9be (patch)
treede525df69e770cab38a54110f7744cc7d2d5459d /configs/releng/airootfs
parent767c09569d840538f43ed2788929b1921707412f (diff)
config/releng: remove pacman hooks specific to ISO build process from airootfs after they run
This works around https://bugs.archlinux.org/task/49347 . Leaving the hooks in the airootfs image will result in it being run when pacstrap is run in the live environment. This should not happen as they are intended for the ISO build process only. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/91 .
Diffstat (limited to 'configs/releng/airootfs')
-rw-r--r--configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook1
-rw-r--r--configs/releng/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook18
2 files changed, 19 insertions, 0 deletions
diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
index ad0b5ba..342aa95 100644
--- a/configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
+++ b/configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
@@ -1,3 +1,4 @@
+# remove from airootfs!
[Trigger]
Operation = Install
Operation = Upgrade
diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook b/configs/releng/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook
new file mode 100644
index 0000000..8dfb943
--- /dev/null
+++ b/configs/releng/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/)"