From ceb3985b858d99d8438f6dccc93bbaab5a72c38c Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 28 Aug 2023 11:51:00 +0200
Subject: [PATCH] add loadkeys to latest-base, fix kernel detection on latest
 images

---
 usr/lib/archboot/update/manage.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh
index 272d2cd7e..bb48fd2bc 100644
--- a/usr/lib/archboot/update/manage.sh
+++ b/usr/lib/archboot/update/manage.sh
@@ -108,7 +108,7 @@ _clean_archboot() {
 }
 
 _collect_files() {
-    ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;archboot-cpio.sh -k "${_RAM}/${_VMLINUZ}" -c ${_CONFIG} -d /tmp" >"${_LOG}" 2>&1
+    ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;archboot-cpio.sh -c ${_CONFIG} -d /tmp" >"${_LOG}" 2>&1
     rm "${_W_DIR}"/.archboot
 }
 
@@ -192,16 +192,16 @@ _new_environment() {
     _progress_wait "2" "49" "Generating container in ${_W_DIR}..." "3"
     _clean_kernel_cache
     _ram_check
-    mkdir "${_RAM}"
-    mount -t ramfs none "${_RAM}"
-    _progress "50" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
-    # use ramfs to get immediate free space on file deletion
-    mv "${_W_DIR}/boot/${_VMLINUZ}" "${_RAM}/"
     # write initramfs to "${_ROOTFS_DIR}
     touch "${_W_DIR}"/.archboot
     _collect_files &
-    _progress_wait "51" "84" "Collecting rootfs files in ${_W_DIR}..." "1"
-    _progress "85" "Cleanup ${_W_DIR}..."
+    _progress_wait "50" "83" "Collecting rootfs files in ${_W_DIR}..." "1"
+    _progress "84" "Cleanup ${_W_DIR}..."
+    mkdir "${_RAM}"
+    mount -t ramfs none "${_RAM}"
+    _progress "85" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
+    # use ramfs to get immediate free space on file deletion
+    mv "${_W_DIR}/boot/${_VMLINUZ}" "${_RAM}/"
     find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \;
     _clean_kernel_cache
     _ram_check