From 274678334e2052f56e404071088e4c4aa093fe53 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 9 Sep 2024 14:15:56 +0200
Subject: [PATCH] move all _PACKAGES initialization to common.sh

---
 usr/bin/archboot-quickinst.sh        | 1 -
 usr/lib/archboot/installer/common.sh | 4 ++++
 usr/lib/archboot/installer/pacman.sh | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/bin/archboot-quickinst.sh b/usr/bin/archboot-quickinst.sh
index 7a14ef60f..5482426a2 100755
--- a/usr/bin/archboot-quickinst.sh
+++ b/usr/bin/archboot-quickinst.sh
@@ -42,7 +42,6 @@ _prepare_pacman() {
 
 # package_installation
 _install_packages() {
-    . /etc/archboot/defaults
     _auto_packages
     #shellcheck disable=SC2068
     ${_PACMAN} -S ${_PACKAGES[@]}
diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index 7c905346d..89c3adc2b 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -96,6 +96,10 @@ _local_pacman_conf() {
 }
 
 _auto_packages() {
+    # add packages from Archboot defaults
+    . /etc/archboot/defaults
+    # remove linux-firmware packages first
+    _PACKAGES=(${_PACKAGES[@]/linux-firmware*})
     # Add filesystem packages
     if ${_LSBLK} FSTYPE | rg -q 'bcachefs'; then
         ! echo "${_PACKAGES[@]}" | rg -qw 'bcachefs-tools' && _PACKAGES+=(bcachefs-tools)
diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index 1658d1c16..661147223 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -62,9 +62,6 @@ _run_autoconfig() {
 
 _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