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

autodetect LVM2,cryptsetup and mdadm devices

Browse source
This commit is contained in:
Tobias Powalowski 2023-02-02 14:03:03 +01:00
parent dcf0b4a7fc
commit 97e5f001eb
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/archboot/defaults
View file

@ -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 lvm2 mdadm cryptsetup bash-completion"
_PACKAGES="base linux bash-completion"
# grub setup
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"

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

@ -101,13 +101,25 @@ _auto_packages() {
if lsblk -rnpo FSTYPE | grep -q vfat; then
! echo "${_PACKAGES}" | grep -qw dosfstools && _PACKAGES="${_PACKAGES} dosfstools"
fi
if lsmod | grep -qw wl; then
! echo "${_PACKAGES}" | grep -qw broadcom-wl && _PACKAGES="${_PACKAGES} broadcom-wl"
# Add packages for complex blockdevices
if lsblk -rnpo FSTYPE | grep -qw 'linux_raid_member'; then
! echo "${_PACKAGES}" | grep -qw mdadm && _PACKAGES="${_PACKAGES} mdadm"
fi
if lsblk -rnpo FSTYPE | grep -qw 'LVM2_member'; then
! echo "${_PACKAGES}" | grep -qw lvm2 && _PACKAGES="${_PACKAGES} lvm2"
fi
if lsblk -rnpo FSTYPE | grep -qw 'crypto_LUKS'; then
! echo "${_PACKAGES}" | grep -qw cryptsetup && _PACKAGES="${_PACKAGES} cryptsetup"
fi
#shellcheck disable=SC2010
# Add iwd, if wlan is detected
if ls /sys/class/net | grep -q wlan; then
! echo "${_PACKAGES}" | grep -qw iwd && _PACKAGES="${_PACKAGES} iwd"
fi
# Add broadcom-wl, if module is detected
if lsmod | grep -qw wl; then
! echo "${_PACKAGES}" | grep -qw broadcom-wl && _PACKAGES="${_PACKAGES} broadcom-wl"
fi
grep -q '^FONT=ter' /etc/vconsole.conf && _PACKAGES="${_PACKAGES} terminus-font"
# only add firmware if already used
_linux_firmware