usr/bin/archboot-update.sh

@@ -61,7 +61,7 @@ if [[ -n "${_G_RELEASE}" ]]; then
 fi
 # install custom xorg or wayland
 #shellcheck disable=SC2128
-if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WL}" ]]; then
+if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
     _custom_wayland_xorg
 fi
 # Gnome, KDE/PLASMA or XFCE launch

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

usr/lib/archboot/container.sh

@@ -159,7 +159,7 @@ _install_base_packages() {
     else
         _MKINITCPIO=initramfs
     fi
-    _PACKAGES+=(${_LINUX_FIRMWARE[@]})
+    _PACKAGES+=(linux-firmware linux-firmware-marvell)
     if [[ "${2}" == "use_binfmt" ]]; then
         #shellcheck disable=SC2068,SC2145
         echo "Downloading ${_KEYRING[@]} ${_PACKAGES[@]} to ${1}..."

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