etc/archboot/defaults

@@ -4,8 +4,6 @@
 _PACKAGES=(
   base
   linux
-  linux-firmware
-  linux-firmware-marvell
   polkit
 )
 # grub setup

usr/bin/archboot-quickinst.sh

@@ -42,6 +42,7 @@ _prepare_pacman() {
 
 # package_installation
 _install_packages() {
+    . /etc/archboot/defaults
     _auto_packages
     #shellcheck disable=SC2068
     ${_PACMAN} -S ${_PACKAGES[@]}

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

usr/lib/archboot/container.sh

@@ -159,6 +159,7 @@ _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}..."

usr/lib/archboot/installer/common.sh

@@ -96,10 +96,6 @@ _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)

usr/lib/archboot/installer/pacman.sh

@@ -62,6 +62,8 @@ _run_autoconfig() {
 
 _install_packages() {
     _destdir_mounts || return 1
+    # add packages from Archboot defaults
+    . /etc/archboot/defaults
     _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

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