From e403db6724bb486d65749bbbaac713504c532673 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 11 Feb 2023 13:57:15 +0100
Subject: [PATCH] fix path

---
 etc/archboot/x86_64-init.conf |  2 +-
 usr/lib/archboot/release.sh   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/archboot/x86_64-init.conf b/etc/archboot/x86_64-init.conf
index 2355fe8c3..a1a7a554a 100644
--- a/etc/archboot/x86_64-init.conf
+++ b/etc/archboot/x86_64-init.conf
@@ -9,7 +9,7 @@ FILES=()
 # SETUP
 #
 # Please change the hooks only if you know what you are doing.
-HOOKS=(archboot_init) 
+HOOKS=(archboot_init keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression
diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh
index 9fb68eb29..f1bad912c 100644
--- a/usr/lib/archboot/release.sh
+++ b/usr/lib/archboot/release.sh
@@ -78,14 +78,14 @@ _create_iso() {
         for i in *.iso; do
             if  echo "${i}" | grep -v local | grep -vq latest; then
                 isoinfo -R -i "${i}" -x /efi.img 2>/dev/null > "efi.img"
-                mcopy -m -i "${i}" ::/"${_AMD_UCODE}" ./"${_AMD_UCODE}"
+                mcopy -m -i efi.img ::/"${_AMD_UCODE}" ./"${_AMD_UCODE}"
                 [[ "${_ARCH}" == "aarch64" ]] || mcopy -m -i "${i}" ::/"${_INTEL_UCODE}" ./"${_INTEL_UCODE}"
-                mcopy -m -i "${i}" ::/"${_INITRAMFS}" ./"${_INITRAMFS}"
-                mcopy -m -i "${i}" ::/"${_KERNEL}" ./"${_KERNEL_ARCHBOOT}"
+                mcopy -m -i efi.img ::/"${_INITRAMFS}" ./"${_INITRAMFS}"
+                mcopy -m -i efi.img ::/"${_KERNEL}" ./"${_KERNEL_ARCHBOOT}"
             elif echo "${i}" | grep -q latest; then
-                mcopy -m -i "${i}" ::/"${_INITRAMFS}" ./"${_INITRAMFS_LATEST}"
+                mcopy -m -i efi.img ::/"${_INITRAMFS}" ./"${_INITRAMFS_LATEST}"
             elif echo "${i}" | grep -q local; then
-                mcopy -m -i "${i}" ::/"${_INITRAMFS}" ./"${_INITRAMFS_LOCAL}"
+                mcopy -m -i efi,img ::/"${_INITRAMFS}" ./"${_INITRAMFS_LOCAL}"
             fi
         done
         echo "Generating Unified Kernel Images..."