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 device checks

Browse source
This commit is contained in:
Tobias Powalowski 2022-01-26 18:36:32 +01:00
parent 40fbd4c83c
commit 2ae7dd962c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/bin/archboot-setup.sh
View file

@ -236,7 +236,7 @@ blockdevices() {
# ${_LSBLK} FSTYPE ${dev} | grep "isw_raid_member"
#- fakeraid ddf devices
# ${_LSBLK} FSTYPE ${dev} | grep "ddf_raid_member"
if ! ${_LSBLK} TYPE "${dev}" | grep -q "dmraid" || ${_LSBLK} FSTYPE "${dev}" | grep -q "iso9660" || ${_LSBLK} FSTYPE "${dev}" | grep -q "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" | grep -q "ddf_raid_member"; then
if ! (${_LSBLK} TYPE "${dev}" | grep -q "dmraid" || ${_LSBLK} FSTYPE "${dev}" | grep -q "iso9660" || ${_LSBLK} FSTYPE "${dev}" | grep -q "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" | grep -q "ddf_raid_member"); then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
fi
@ -284,7 +284,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}" | grep "LVM2_member" || ${_LSBLK} FSTYPE "${dev}" | grep "crypto_LUKS" || ${_LSBLK} FSTYPE "${dev}" -s | grep "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" -s | grep "ddf_raid_member"; then
if ! (${_LSBLK} FSTYPE "${dev}" | grep "LVM2_member" || ${_LSBLK} FSTYPE "${dev}" | grep "crypto_LUKS" || ${_LSBLK} FSTYPE "${dev}" -s | grep "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" -s | grep "ddf_raid_member"); then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
fi
@ -315,7 +315,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}" | grep "LVM2_member" || ${_LSBLK} FSTYPE "${part}" | grep "crypto_LUKS" || sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$" || sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$" || ${_LSBLK} FSTYPE "${dev}" -s | grep "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" -s | grep "ddf_raid_member"; then
if ! (${_LSBLK} FSTYPE "${part}" | grep "LVM2_member" || ${_LSBLK} FSTYPE "${part}" | grep "crypto_LUKS" || sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$" || sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$" || ${_LSBLK} FSTYPE "${dev}" -s | grep "isw_raid_member" || ${_LSBLK} FSTYPE "${dev}" -s | grep "ddf_raid_member"); then
echo "${part}"
[[ "${1}" ]] && echo "${1}"
fi
@ -359,7 +359,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}" | grep "crypto_LUKS$" || ${_LSBLK} FSTYPE "${part}" | grep "LVM2_member$" || ${_LSBLK} FSTYPE "${part}" | grep "linux_raid_member$" || sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$"|| sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$"; then
if ! (${_LSBLK} FSTYPE "${part}" | grep "crypto_LUKS$" || ${_LSBLK} FSTYPE "${part}" | grep "LVM2_member$" || ${_LSBLK} FSTYPE "${part}" | grep "linux_raid_member$" || sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$"|| sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$"); then
echo "${part}"
[[ "${1}" ]] && echo "${1}"
fi
@ -395,7 +395,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 "crypto_LUKS$" || ${_LSBLK} FSTYPE "${dev}" | grep "LVM2_member$" || ${_LSBLK} FSTYPE "${dev}" | grep "linux_raid_member$" || ${_LSBLK} TYPE "${dev}" | grep "raid.*$"; then
if ! (${_LSBLK} FSTYPE "${dev}" | grep "crypto_LUKS$" || ${_LSBLK} FSTYPE "${dev}" | grep "LVM2_member$" || ${_LSBLK} FSTYPE "${dev}" | grep "linux_raid_member$" || ${_LSBLK} TYPE "${dev}" | grep "raid.*$"); then
echo "${dev}"
[[ "${1}" ]] && echo "${1}"
fi