mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
restore firmware inclusion
This commit is contained in:
parent
0711d6822e
commit
0446d99b0f
2 changed files with 3 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
||||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
# packages to install (eg. firmware, kernel packages)
|
# packages to install (eg. firmware, kernel packages)
|
||||||
_PACKAGES="base linux bash-completion"
|
_PACKAGES="base linux linux-firmware linux-firmware-marvell bash-completion"
|
||||||
# grub setup
|
# grub setup
|
||||||
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
||||||
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
||||||
|
|
|
@ -18,6 +18,7 @@ _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/ca
|
||||||
_MIRRORLIST="/etc/pacman.d/mirrorlist"
|
_MIRRORLIST="/etc/pacman.d/mirrorlist"
|
||||||
|
|
||||||
_linux_firmware() {
|
_linux_firmware() {
|
||||||
|
_PACKAGES="${_PACKAGES//\ linux-firmware\ / }"
|
||||||
#shellcheck disable=SC2013
|
#shellcheck disable=SC2013
|
||||||
for i in $(cut -d ' ' -f1</proc/modules); do
|
for i in $(cut -d ' ' -f1</proc/modules); do
|
||||||
if modinfo "${i}" | grep -qw 'firmware:'; then
|
if modinfo "${i}" | grep -qw 'firmware:'; then
|
||||||
|
@ -29,6 +30,7 @@ _linux_firmware() {
|
||||||
|
|
||||||
_marvell_firmware() {
|
_marvell_firmware() {
|
||||||
_MARVELL=""
|
_MARVELL=""
|
||||||
|
_PACKAGES="${_PACKAGES//\ linux-firmware-marvell\ / }"
|
||||||
for i in $(find /lib/modules/"$(uname -r)" | grep -w wireless | grep -w marvell); do
|
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')"
|
[[ -f $i ]] && _MARVELL="${_MARVELL} $(basename "${i}" | sed -e 's#\..*$##g')"
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue