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

fix array checks

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-17 11:04:52 +02:00
parent 252f0e222b
commit a51f72ca31
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/lib/archboot/installer/blockdevices.sh
View file

@ -52,6 +52,8 @@ blockdevices() {
# ${_LSBLK} FSTYPE ${dev} | grep "isw_raid_member"
#- fakeraid ddf devices
# ${_LSBLK} FSTYPE ${dev} | grep "ddf_raid_member"
# - zram devices
# echo "${dev}" | grep -q 'zram'
if ! ${_LSBLK} TYPE "${dev}" 2>/dev/null | grep -q "dmraid" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "iso9660" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "ddf_raid_member" && ! echo "${dev}" | grep -q 'zram'; then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
@ -80,7 +82,7 @@ blockdevices_partitions() {
# "echo ${part} | grep "[a-z]$(parted -s $(${_LSBLK} PKNAME ${part}) print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$"
#- iso9660 devices
# "${_LSBLK} FSTYPE -s ${part} | grep "iso9660"
if ! (${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "linux_raid_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$" && ! echo "${part}" | grep -q "[a-z]$(parted -s "$(${_LSBLK} PKNAME "${part}" 2>/dev/null)" print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$" && ! ${_LSBLK} FSTYPE -s "${part}" 2>/dev/null | grep -q "iso9660"); then
if ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "linux_raid_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$" && ! echo "${part}" | grep -q "[a-z]$(parted -s "$(${_LSBLK} PKNAME "${part}" 2>/dev/null)" print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$" && ! ${_LSBLK} FSTYPE -s "${part}" 2>/dev/null | grep -q "iso9660"; then
echo "${part}"
[[ "${1}" ]] && echo "${1}"
fi
@ -101,7 +103,7 @@ raid_devices() {
# ${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member"
# - part of ddf fakeraid
# ${_LSBLK} FSTYPE ${dev} -s | grep "ddf_raid_member"
if ! (${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "ddf_raid_member" && ! find "$dev"*p* -type f -exec echo {} \; 2>/dev/null ); then
if ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "ddf_raid_member" && ! find "$dev"*p* -type f -exec echo {} \; 2>/dev/null; then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
fi
@ -124,7 +126,7 @@ partitionable_raid_devices_partitions() {
# ${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member"
# - part of ddf fakeraid
# ${_LSBLK} FSTYPE ${dev} -s | grep "ddf_raid_member"
if ! (${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "ddf_raid_member"); then
if ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s 2>/dev/null | grep -q "ddf_raid_member"; then
echo "${part}"
[[ "${1}" ]] && echo "${1}"
fi
@ -168,7 +170,7 @@ dmraid_partitions() {
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$"
# - extended partition (LBA)
# sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$")
if ! (${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "linux_raid_member$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$"&& ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$"); then
if ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "crypto_LUKS$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "LVM2_member$" && ! ${_LSBLK} FSTYPE "${part}" 2>/dev/null | grep -q "linux_raid_member$" && ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "Extended$"&& ! sfdisk -l 2>/dev/null | grep "${part}" | grep -q "(LBA)$"; then
echo "${part}"
[[ "${1}" ]] && echo "${1}"
fi
@ -204,7 +206,7 @@ dm_devices() {
# ${_LSBLK} FSTYPE ${dev} | grep "linux_raid_member$"
# - part of running raid on encrypted device
# ${_LSBLK} TYPE ${dev} | grep "raid.*$
if ! (${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS$" 2>/dev/null && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member$" 2>/dev/null && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "linux_raid_member$" && ! ${_LSBLK} TYPE "${dev}" 2>/dev/null | grep -q "raid.*$"); then
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS$" 2>/dev/null && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member$" 2>/dev/null && ! ${_LSBLK} FSTYPE "${dev}" 2>/dev/null | grep -q "linux_raid_member$" && ! ${_LSBLK} TYPE "${dev}" 2>/dev/null | grep -q "raid.*$"; then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
fi