mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
implement mdadm isw_raid_member support
This commit is contained in:
parent
fc2b4cd1cd
commit
628602f5e2
1 changed files with 21 additions and 4 deletions
|
@ -437,7 +437,9 @@ raid_devices() {
|
||||||
# ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member")
|
# ${_LSBLK} FSTYPE ${dev} | grep "LVM2_member")
|
||||||
# - part of luks device
|
# - part of luks device
|
||||||
# $(${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS")
|
# $(${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS")
|
||||||
if ! [[ "$(${_LSBLK} FSTYPE ${dev} | grep "LVM2_member")" || "$(${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS")" ]]; then
|
# - part of isw fakeraid
|
||||||
|
# $(${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member")
|
||||||
|
if ! [[ "$(${_LSBLK} FSTYPE ${dev} | grep "LVM2_member")" || "$(${_LSBLK} FSTYPE ${dev} | grep "crypto_LUKS")" || "$(${_LSBLK} FSTYPE ${dev} -s | grep "isw_raid_member")" ]]; then
|
||||||
echo "${dev}"
|
echo "${dev}"
|
||||||
[[ "${1}" ]] && echo ${1}
|
[[ "${1}" ]] && echo ${1}
|
||||||
fi
|
fi
|
||||||
|
@ -464,20 +466,28 @@ partitionable_raid_devices_partitions() {
|
||||||
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$")
|
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "Extended$")
|
||||||
# - extended partition (LBA)
|
# - extended partition (LBA)
|
||||||
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$")")
|
# $(sfdisk -l 2>/dev/null | grep "${part}" | grep "(LBA)$")")
|
||||||
echo "${part}"
|
# - part of isw fakeraid
|
||||||
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)$")" ]]; then
|
# $(${_LSBLK} FSTYPE ${dev} -s | grep "isw_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") ]]; then
|
||||||
echo "${part}"
|
echo "${part}"
|
||||||
[[ "${1}" ]] && echo ${1}
|
[[ "${1}" ]] && echo ${1}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# lists linux dmraid devices
|
# lists dmraid devices
|
||||||
dmraid_devices() {
|
dmraid_devices() {
|
||||||
for dev in $(${_LSBLK} NAME,TYPE | grep "dmraid$" | cut -d' ' -f 1 | grep -v "_.*p.*$" | sort -u); do
|
for dev in $(${_LSBLK} NAME,TYPE | grep "dmraid$" | cut -d' ' -f 1 | grep -v "_.*p.*$" | sort -u); do
|
||||||
echo "${dev}"
|
echo "${dev}"
|
||||||
[[ "${1}" ]] && echo ${1}
|
[[ "${1}" ]] && echo ${1}
|
||||||
done
|
done
|
||||||
|
# isw_raid_member, managed by mdadm
|
||||||
|
for dev in $(${_LSBLK} NAME,TYPE ${i} | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
|
||||||
|
if [[ "$(${_LSBLK} NAME,FSTYPE -s | grep "isw_raid_member$" | cut -d' ' -f 1)" ]]; then
|
||||||
|
echo "${dev}"
|
||||||
|
[[ "${1}" ]] && echo ${1}
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# dmraid_partitions
|
# dmraid_partitions
|
||||||
|
@ -500,6 +510,13 @@ dmraid_partitions() {
|
||||||
[[ "${1}" ]] && echo ${1}
|
[[ "${1}" ]] && echo ${1}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# isw_raid_member, managed by mdadm
|
||||||
|
for dev in $(${_LSBLK} NAME,TYPE ${i} | grep " md$" | cut -d' ' -f 1 | sort -u); do
|
||||||
|
if [[ "$(${_LSBLK} NAME,FSTYPE -s | grep "isw_raid_member$" | cut -d' ' -f 1)" ]]; then
|
||||||
|
echo "${dev}"
|
||||||
|
[[ "${1}" ]] && echo ${1}
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# dm_devices
|
# dm_devices
|
||||||
|
|
Loading…
Reference in a new issue