From d00823f4d1c1076f9a7f7b6b60db57bce6ae2fde Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 9 Sep 2024 11:23:36 +0200
Subject: [PATCH] fix repository firmware

---
 usr/lib/archboot/common.sh     | 4 ++++
 usr/lib/archboot/container.sh  | 2 +-
 usr/lib/archboot/repository.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index 03fd465f2..b897fc4cd 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -24,6 +24,10 @@ _KEYRING=(archlinux-keyring)
 _LABEL="Exit"
 _LOCAL_DB="${_CACHEDIR}/archboot.db"
 _LOG="/dev/tty11"
+_LINUX_FIRMWARE=(
+ linux-firmware
+ linux-firmware-marvell
+)
 _MAN_INFO_PACKAGES=(
   man-db
   man-pages
diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 4c0af2458..dc7c3b0be 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -159,7 +159,7 @@ _install_base_packages() {
     else
         _MKINITCPIO=initramfs
     fi
-    _PACKAGES+=(linux-firmware linux-firmware-marvell)
+    _PACKAGES+=(${_LINUX_FIRMWARE[@]})
     if [[ "${2}" == "use_binfmt" ]]; then
         #shellcheck disable=SC2068,SC2145
         echo "Downloading ${_KEYRING[@]} ${_PACKAGES[@]} to ${1}..."
diff --git a/usr/lib/archboot/repository.sh b/usr/lib/archboot/repository.sh
index 8911a81ae..440543595 100644
--- a/usr/lib/archboot/repository.sh
+++ b/usr/lib/archboot/repository.sh
@@ -20,7 +20,7 @@ _download_packages() {
         _pacman_key_system
     fi
     #shellcheck disable=SC2206
-    _PACKAGES+=(${_KEYRING[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
+    _PACKAGES+=(${_KEYRING[@]} ${_LINUX_FIRMWARE[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
     #shellcheck disable=SC2145
     echo "Downloading ${_PACKAGES[@]} to ${1}..."
     #shellcheck disable=SC2086,SC2068