From 0446d99b0f0d329516c655010bb887dab7bff336 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 2 Feb 2023 22:44:46 +0100
Subject: [PATCH] restore firmware inclusion

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

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index 7b34aed61..22f59d4dd 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -2,7 +2,7 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-2.0-only
 # packages to install (eg. firmware, kernel packages)
-_PACKAGES="base linux bash-completion"
+_PACKAGES="base linux linux-firmware linux-firmware-marvell bash-completion"
 # grub setup
 _GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
 _GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index e2a7895b5..de6f940bf 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -18,6 +18,7 @@ _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/ca
 _MIRRORLIST="/etc/pacman.d/mirrorlist"
 
 _linux_firmware() {
+    _PACKAGES="${_PACKAGES//\ linux-firmware\ / }"
     #shellcheck disable=SC2013
     for i in $(cut -d ' ' -f1</proc/modules); do
         if modinfo "${i}" | grep -qw 'firmware:'; then
@@ -29,6 +30,7 @@ _linux_firmware() {
 
 _marvell_firmware() {
     _MARVELL=""
+    _PACKAGES="${_PACKAGES//\ linux-firmware-marvell\ / }"
     for i in $(find /lib/modules/"$(uname -r)" | grep -w wireless | grep -w marvell); do
         [[ -f $i ]] && _MARVELL="${_MARVELL} $(basename "${i}" | sed -e 's#\..*$##g')"
     done