root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

linux-firmware is autodetected

Browse source
This commit is contained in:
Tobias Powalowski 2024-09-08 17:01:59 +02:00
parent 2328da0f10
commit 62852a2a59
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/archboot/defaults
View file

@ -4,8 +4,6 @@
_PACKAGES=( _PACKAGES=(
base base
linux linux
linux-firmware
linux-firmware-marvell
polkit polkit
) )
# grub setup # grub setup

10
usr/lib/archboot/installer/common.sh
View file

@ -30,8 +30,6 @@ fi
_PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm" _PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}${_CACHEDIR} --noconfirm"
_linux_firmware() { _linux_firmware() {
#shellcheck disable=SC2206
_PACKAGES=(${_PACKAGES[@]/linux-firmware })
#shellcheck disable=SC2013 #shellcheck disable=SC2013
for i in $(choose 0 </proc/modules); do for i in $(choose 0 </proc/modules); do
if modinfo "${i}" | rg -qw 'firmware:'; then if modinfo "${i}" | rg -qw 'firmware:'; then
@ -42,14 +40,12 @@ _linux_firmware() {
} }
_marvell_firmware() { _marvell_firmware() {
_MARVELL="" _MARVELL=()
#shellcheck disable=SC2206
_PACKAGES=(${_PACKAGES[@]/linux-firmware-marvell})
for i in $(fd -t f . /lib/modules/"${_RUNNING_KERNEL}" | rg -w 'wireless/marvell'); do for i in $(fd -t f . /lib/modules/"${_RUNNING_KERNEL}" | rg -w 'wireless/marvell'); do
_MARVELL="${_MARVELL} $(basename "${i}" | sd '.ko.*$' '')" _MARVELL+=($(basename "${i}" | sd '.ko.*$' ''))
done done
# check marvell modules if already loaded # check marvell modules if already loaded
for i in ${_MARVELL}; do for i in ${_MARVELL[@]}; do
if lsmod | rg -qw "${i}"; then if lsmod | rg -qw "${i}"; then
_PACKAGES+=(linux-firmware-marvell) _PACKAGES+=(linux-firmware-marvell)
break break