From 2c7726a14eb6ba94b5c5fe1c593b6aa1991a38b5 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 9 Sep 2024 14:06:15 +0200
Subject: [PATCH] revert firmware changes

---
 etc/archboot/defaults                | 2 ++
 usr/lib/archboot/common.sh           | 4 ----
 usr/lib/archboot/container.sh        | 1 -
 usr/lib/archboot/installer/pacman.sh | 1 +
 usr/lib/archboot/repository.sh       | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index eb6f94f93..71852ad71 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -4,6 +4,8 @@
 _PACKAGES=(
   base
   linux
+  linux-firmware
+  linux-firmware-marvell
   polkit
 )
 # grub setup
diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index b897fc4cd..03fd465f2 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -24,10 +24,6 @@ _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 dc7c3b0be..4e6117a21 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -159,7 +159,6 @@ _install_base_packages() {
     else
         _MKINITCPIO=initramfs
     fi
-    _PACKAGES+=(${_LINUX_FIRMWARE[@]})
     if [[ "${2}" == "use_binfmt" ]]; then
         #shellcheck disable=SC2068,SC2145
         echo "Downloading ${_KEYRING[@]} ${_PACKAGES[@]} to ${1}..."
diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index 411792436..bbe61333a 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -64,6 +64,7 @@ _install_packages() {
     _destdir_mounts || return 1
     # add packages from Archboot defaults
     . /etc/archboot/defaults
+    _PACKAGES=(${_PACKAGES/linux-firmware*})
     _auto_packages
     #shellcheck disable=SC2116,SC2068
     _dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n$(echo ${_PACKAGES[@]})\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1
diff --git a/usr/lib/archboot/repository.sh b/usr/lib/archboot/repository.sh
index 440543595..8911a81ae 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[@]} ${_LINUX_FIRMWARE[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
+    _PACKAGES+=(${_KEYRING[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
     #shellcheck disable=SC2145
     echo "Downloading ${_PACKAGES[@]} to ${1}..."
     #shellcheck disable=SC2086,SC2068