mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
remove hardcoded packages and move them to defaults
This commit is contained in:
parent
ce039c0cbc
commit
5f6da2efcc
2 changed files with 1 additions and 18 deletions
|
@ -2,7 +2,7 @@
|
|||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# packages to install (eg. firmware, kernel packages)
|
||||
_PACKAGES="base linux linux-firmware linux-firmware-marvell"
|
||||
_PACKAGES="base linux lvm2 mdadm cryptsetup nano neovim bash-completion"
|
||||
# grub setup
|
||||
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
||||
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
||||
|
|
|
@ -18,7 +18,6 @@ _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/ca
|
|||
_MIRRORLIST="/etc/pacman.d/mirrorlist"
|
||||
|
||||
_linux_firmware() {
|
||||
_PACKAGES="${_PACKAGES//\ linux-firmware\ / }"
|
||||
#shellcheck disable=SC2013
|
||||
for i in $(cut -d ' ' -f1</proc/modules); do
|
||||
if modinfo "${i}" | grep -qw 'firmware:'; then
|
||||
|
@ -30,7 +29,6 @@ _linux_firmware() {
|
|||
|
||||
_marvell_firmware() {
|
||||
_MARVELL=""
|
||||
_PACKAGES="${_PACKAGES// linux-firmware-marvell/ }"
|
||||
for i in $(find /lib/modules/"$(uname -r)" | grep -w wireless | grep -w marvell); do
|
||||
[[ -f $i ]] && _MARVELL="${_MARVELL} $(basename "${i}" | sed -e 's#\..*$##g')"
|
||||
done
|
||||
|
@ -114,21 +112,6 @@ _auto_packages() {
|
|||
# only add firmware if already used
|
||||
_linux_firmware
|
||||
_marvell_firmware
|
||||
# ucode package, expression needs to be fixed for bash 5.2.x:
|
||||
### HACK:
|
||||
# always add lvm2, cryptsetup, mdadm, nano, neovim and bash-completion
|
||||
_PACKAGES="${_PACKAGES//\ lvm2\ / }"
|
||||
_PACKAGES="${_PACKAGES} lvm2"
|
||||
_PACKAGES="${_PACKAGES//\ cryptsetup\ / }"
|
||||
_PACKAGES="${_PACKAGES} cryptsetup"
|
||||
_PACKAGES="${_PACKAGES//\ mdadm\ / }"
|
||||
_PACKAGES="${_PACKAGES} mdadm"
|
||||
_PACKAGES="${_PACKAGES//\ nano\ / }"
|
||||
_PACKAGES="${_PACKAGES} nano"
|
||||
_PACKAGES="${_PACKAGES//\ neovim\ / }"
|
||||
_PACKAGES="${_PACKAGES} neovim"
|
||||
_PACKAGES="${_PACKAGES//\ bash-completion\ / }"
|
||||
_PACKAGES="${_PACKAGES} bash-completion"
|
||||
}
|
||||
|
||||
# /etc/locale.gen
|
||||
|
|
Loading…
Reference in a new issue