From 04d26f45a6605599983f99f7be8f9e565000063d Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Fri, 7 Jan 2022 19:08:14 +0100
Subject: [PATCH] fix cleanup in tarball helper

---
 usr/bin/archboot-aarch64-create-container.sh | 2 +-
 usr/bin/archboot-tarball-helper.sh           | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/bin/archboot-aarch64-create-container.sh b/usr/bin/archboot-aarch64-create-container.sh
index 4fe41deff..5bcf9a821 100755
--- a/usr/bin/archboot-aarch64-create-container.sh
+++ b/usr/bin/archboot-aarch64-create-container.sh
@@ -72,7 +72,7 @@ cp "${AARCH64_ARCHBOOT}" "${_DIR}/"
 cp "${AARCH64_ARCHBOOT_FIRMWARE}" "${_DIR}/"
 # install archboot-arm
 echo "Install archboot-arm and archboot-linux-firmware to container..."
-systemd-nspawn -D "${_DIR}" /bin/bash -c "yes | pacman -U /archboot-firmware-latest.tar.zst" >/dev/null 2>&1
+systemd-nspawn -D "${_DIR}" /bin/bash -c "yes | pacman -U /archboot-linux-firmware-latest.tar.zst" >/dev/null 2>&1
 systemd-nspawn -D "${_DIR}" /bin/bash -c "yes | pacman -U /archboot-arm-latest.tar.zst" >/dev/null 2>&1
 if [[ "${_SAVE_RAM}" ==  "1" ]]; then
     # clean container from not needed files
diff --git a/usr/bin/archboot-tarball-helper.sh b/usr/bin/archboot-tarball-helper.sh
index d7f2e48ac..f38f96798 100755
--- a/usr/bin/archboot-tarball-helper.sh
+++ b/usr/bin/archboot-tarball-helper.sh
@@ -98,5 +98,7 @@ if ! [ "${TARNAME}" = "" ]; then
 fi
 # clean directory
 rm -r ${TEMPDIR}
-rm ${BOOTMESSAGE}
-rm ${OPTIONSBOOTMESSAGE}
+if [[ "$(uname -m)" == "x86_64" ]]; then
+    rm ${BOOTMESSAGE}
+    rm ${OPTIONSBOOTMESSAGE}
+fi