mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix partitionable raid partitions listing
This commit is contained in:
parent
c8f1f21d1d
commit
b22a6e6ef9
1 changed files with 15 additions and 16 deletions
|
@ -439,21 +439,20 @@ blockdevices_partitions() {
|
|||
for part in $(${_LSBLK} NAME,TYPE -ds | grep "part$"| cut -d' ' -f1); do
|
||||
# exclude checks:
|
||||
#- part of raid device
|
||||
# $(cat /proc/mdstat 2>/dev/null | grep ${part})
|
||||
#- part of lvm2 device
|
||||
# $(${_LSBLK} FSTYPE /dev/${part} | grep "LVM2_member")
|
||||
#- part of luks device
|
||||
# $(${_LSBLK} FSTYPE /dev/${part} | grep "crypto_LUKS")
|
||||
#- extended partition
|
||||
# $(sfdisk -l 2>/dev/null | grep ${part} | grep "Extended$")"
|
||||
#- bios_grub partitions
|
||||
# "$(echo ${part} | grep "[a-z]$(parted -s $(${_LSBLK} PKNAME ${part}) print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$")"
|
||||
if ! [[ "$(cat /proc/mdstat 2>/dev/null | grep $(basename ${part}))" || "$(${_LSBLK} FSTYPE ${part} | grep "LVM2_member")" || "$(${_LSBLK} FSTYPE ${part} | grep "crypto_LUKS")" || "$(sfdisk -l 2>/dev/null | grep ${part} | grep "Extended$")" || "$(echo ${part} | grep "[a-z]$(parted -s $(${_LSBLK} PKNAME ${part}) print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$")" ]]; then
|
||||
echo "${part}"
|
||||
[[ "${1}" ]] && echo ${1}
|
||||
fi
|
||||
|
||||
done
|
||||
# $(cat /proc/mdstat 2>/dev/null | grep "$(basename ${part})"
|
||||
#- part of lvm2 device
|
||||
# $(${_LSBLK} FSTYPE /dev/${part} | grep "LVM2_member")
|
||||
#- part of luks device
|
||||
# $(${_LSBLK} FSTYPE /dev/${part} | grep "crypto_LUKS")
|
||||
#- extended partition
|
||||
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$")"
|
||||
#- bios_grub partitions
|
||||
# "$(echo ${part} | grep "[a-z]$(parted -s $(${_LSBLK} PKNAME ${part}) print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$")"
|
||||
if ! [[ "$(cat /proc/mdstat 2>/dev/null | grep "$(basename ${part})")" || "$(${_LSBLK} FSTYPE ${part} | grep "LVM2_member")" || "$(${_LSBLK} FSTYPE ${part} | grep "crypto_LUKS")" || "$(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$")" || "$(echo ${part} | grep "[a-z]$(parted -s $(${_LSBLK} PKNAME ${part}) print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$")" ]]; then
|
||||
echo "${part}"
|
||||
[[ "${1}" ]] && echo ${1}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# list none partitionable raid md devices
|
||||
|
@ -488,7 +487,7 @@ partitionable_raid_devices_partitions() {
|
|||
for i in $(ls ${block}/${dev} 2>/dev/null | egrep ${dev}p); do
|
||||
if [[ -d "${block}/${dev}/${i}" ]]; then
|
||||
# exlude md partitions which are part of lvm or luks
|
||||
if ! [[ "$(${_LSBLK} FSTYPE /dev/${i} | grep "LVM2_member")" || ! "$(${_LSBLK} FSTYPE /dev/${i} | grep "crypto_LUKS")" ]]; then
|
||||
if ! [[ "$(${_LSBLK} FSTYPE /dev/${i} | grep "LVM2_member")" || "$(${_LSBLK} FSTYPE /dev/${i} | grep "crypto_LUKS")" || "$(sfdisk -l 2>/dev/null | grep "/dev/${i}" | grep "Extended$")" ]]; then
|
||||
echo "/dev/${i}"
|
||||
[[ "${1}" ]] && echo ${1}
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue