From 62852a2a5970d8049b2829cd0a9e62d39f78e4c1 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 8 Sep 2024 17:01:59 +0200
Subject: [PATCH] linux-firmware is autodetected

---
 etc/archboot/defaults                |  2 --
 usr/lib/archboot/installer/common.sh | 10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index 71852ad71..eb6f94f93 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -4,8 +4,6 @@
 _PACKAGES=(
   base
   linux
-  linux-firmware
-  linux-firmware-marvell
   polkit
 )
 # grub setup
diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index 5c6eb24e0..97f6ac842 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -30,8 +30,6 @@ fi
 _PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm"
 
 _linux_firmware() {
-    #shellcheck disable=SC2206
-    _PACKAGES=(${_PACKAGES[@]/linux-firmware })
     #shellcheck disable=SC2013
     for i in $(choose 0 </proc/modules); do
         if modinfo "${i}" | rg -qw 'firmware:'; then
@@ -42,14 +40,12 @@ _linux_firmware() {
 }
 
 _marvell_firmware() {
-    _MARVELL=""
-    #shellcheck disable=SC2206
-    _PACKAGES=(${_PACKAGES[@]/linux-firmware-marvell})
+    _MARVELL=()
     for i in $(fd -t f . /lib/modules/"${_RUNNING_KERNEL}" | rg -w 'wireless/marvell'); do
-        _MARVELL="${_MARVELL} $(basename "${i}" | sd '.ko.*$' '')"
+        _MARVELL+=($(basename "${i}" | sd '.ko.*$' ''))
     done
     # check marvell modules if already loaded
-    for i in ${_MARVELL}; do
+    for i in ${_MARVELL[@]}; do
         if lsmod | rg -qw "${i}"; then
             _PACKAGES+=(linux-firmware-marvell)
             break