mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 03:20:38 +02:00
move all _PACKAGES initialization to common.sh
This commit is contained in:
parent
0428c86c26
commit
274678334e
3 changed files with 4 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue