Skip to content
Snippets Groups Projects
Commit 27467833 authored by Tobias Powalowski's avatar Tobias Powalowski :sunglasses:
Browse files

move all _PACKAGES initialization to common.sh

parent 0428c86c
No related branches found
No related tags found
No related merge requests found
......@@ -42,7 +42,6 @@ _prepare_pacman() {
# package_installation
_install_packages() {
. /etc/archboot/defaults
_auto_packages
#shellcheck disable=SC2068
${_PACMAN} -S ${_PACKAGES[@]}
......
......@@ -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)
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment