From f1132ca0e850788d49bbab10b6f556ec8d43d435 Mon Sep 17 00:00:00 2001
From: Marcos Mello <marcosfrm@gmail.com>
Date: Tue, 14 Dec 2021 15:27:18 -0300
Subject: [PATCH] Remove archiso_shutdown mkinitcpio hook

It has been superseded by native mkinitcpio (since v16) solution:

- systemd-tmpfiles (via /usr/lib/tmpfiles.d/mkinitcpio.conf fragment) creates /run/initramfs directory during boot.
- Before shutdown, mkinitcpio-generate-shutdown-ramfs.service (enabled by default) populates /run/initramfs using sd-shutdown hook.

Albeit not strictly required, drop it from build.sh too.

See:

https://github.com/archlinux/mkinitcpio/commit/2fa0eb25d47c920c18e7d2498c647a801d836596
https://gitlab.archlinux.org/archlinux/archiso/-/commit/e785ee2ceecc2524cab145097c203dfd83a90710
https://gitlab.archlinux.org/mkinitcpio/mkinitcpio-archiso/-/commit/71238884938e1512e10f9c7809443f07fe5e5fc1
---
 build.sh        | 4 +---
 mkinitcpio.conf | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 70a0652..501dd65 100755
--- a/build.sh
+++ b/build.sh
@@ -129,13 +129,11 @@ make_setup_mkinitcpio() {
     local _hook
     mkdir -p ${work_dir}/${arch}/airootfs/etc/initcpio/hooks
     mkdir -p ${work_dir}/${arch}/airootfs/etc/initcpio/install
-    for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
+    for _hook in archiso archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
         cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/airootfs/etc/initcpio/hooks
         cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/airootfs/etc/initcpio/install
     done
-    sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/${arch}/airootfs/etc/initcpio/install/archiso_shutdown
     cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/${arch}/airootfs/etc/initcpio/install
-    cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/${arch}/airootfs/etc/initcpio
     cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/airootfs/etc/mkinitcpio-archiso.conf
     gnupg_fd=
     if [[ ${gpg_key} ]]; then
diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index 77ac474..4ec98e7 100644
--- a/mkinitcpio.conf
+++ b/mkinitcpio.conf
@@ -1,4 +1,4 @@
 MODULES=(fuse)
 BINARIES=(mount.ntfs)
-HOOKS=(base udev memdisk archiso_shutdown findroot archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block mdadm_udev modconf encrypt lvm2 filesystems keyboard)
+HOOKS=(base udev memdisk findroot archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block mdadm_udev modconf encrypt lvm2 filesystems keyboard)
 COMPRESSION="xz"