mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
revert firmware changes
This commit is contained in:
parent
d00823f4d1
commit
2c7726a14e
5 changed files with 4 additions and 6 deletions
|
@ -4,6 +4,8 @@
|
||||||
_PACKAGES=(
|
_PACKAGES=(
|
||||||
base
|
base
|
||||||
linux
|
linux
|
||||||
|
linux-firmware
|
||||||
|
linux-firmware-marvell
|
||||||
polkit
|
polkit
|
||||||
)
|
)
|
||||||
# grub setup
|
# grub setup
|
||||||
|
|
|
@ -24,10 +24,6 @@ _KEYRING=(archlinux-keyring)
|
||||||
_LABEL="Exit"
|
_LABEL="Exit"
|
||||||
_LOCAL_DB="${_CACHEDIR}/archboot.db"
|
_LOCAL_DB="${_CACHEDIR}/archboot.db"
|
||||||
_LOG="/dev/tty11"
|
_LOG="/dev/tty11"
|
||||||
_LINUX_FIRMWARE=(
|
|
||||||
linux-firmware
|
|
||||||
linux-firmware-marvell
|
|
||||||
)
|
|
||||||
_MAN_INFO_PACKAGES=(
|
_MAN_INFO_PACKAGES=(
|
||||||
man-db
|
man-db
|
||||||
man-pages
|
man-pages
|
||||||
|
|
|
@ -159,7 +159,6 @@ _install_base_packages() {
|
||||||
else
|
else
|
||||||
_MKINITCPIO=initramfs
|
_MKINITCPIO=initramfs
|
||||||
fi
|
fi
|
||||||
_PACKAGES+=(${_LINUX_FIRMWARE[@]})
|
|
||||||
if [[ "${2}" == "use_binfmt" ]]; then
|
if [[ "${2}" == "use_binfmt" ]]; then
|
||||||
#shellcheck disable=SC2068,SC2145
|
#shellcheck disable=SC2068,SC2145
|
||||||
echo "Downloading ${_KEYRING[@]} ${_PACKAGES[@]} to ${1}..."
|
echo "Downloading ${_KEYRING[@]} ${_PACKAGES[@]} to ${1}..."
|
||||||
|
|
|
@ -64,6 +64,7 @@ _install_packages() {
|
||||||
_destdir_mounts || return 1
|
_destdir_mounts || return 1
|
||||||
# add packages from Archboot defaults
|
# add packages from Archboot defaults
|
||||||
. /etc/archboot/defaults
|
. /etc/archboot/defaults
|
||||||
|
_PACKAGES=(${_PACKAGES/linux-firmware*})
|
||||||
_auto_packages
|
_auto_packages
|
||||||
#shellcheck disable=SC2116,SC2068
|
#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
|
_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
|
||||||
|
|
|
@ -20,7 +20,7 @@ _download_packages() {
|
||||||
_pacman_key_system
|
_pacman_key_system
|
||||||
fi
|
fi
|
||||||
#shellcheck disable=SC2206
|
#shellcheck disable=SC2206
|
||||||
_PACKAGES+=(${_KEYRING[@]} ${_LINUX_FIRMWARE[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
|
_PACKAGES+=(${_KEYRING[@]} ${_ARCHBOOT} ${_MAN_INFO_PACKAGES[@]})
|
||||||
#shellcheck disable=SC2145
|
#shellcheck disable=SC2145
|
||||||
echo "Downloading ${_PACKAGES[@]} to ${1}..."
|
echo "Downloading ${_PACKAGES[@]} to ${1}..."
|
||||||
#shellcheck disable=SC2086,SC2068
|
#shellcheck disable=SC2086,SC2068
|
||||||
|
|
Loading…
Reference in a new issue