mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix wrong replacement
This commit is contained in:
parent
2c73aadc74
commit
c14b6668a5
1 changed files with 5 additions and 5 deletions
|
@ -38,7 +38,7 @@ _blockdevices() {
|
|||
# ${_LSBLK} FSTYPE ${dev} | grep "ddf_raid_member"
|
||||
# - zram devices
|
||||
# echo "${dev}" | grep -q 'zram'
|
||||
if ! ${_LSBLK} FSTYPE "${dev}| grep -q "iso9660" && ! ${_LSBLK} FSTYPE "${dev}| grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}| grep -q "ddf_raid_member" && ! echo "${dev}" | grep -q 'zram'; then
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "iso9660" && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "ddf_raid_member" && ! echo "${dev}" | grep -q 'zram'; then
|
||||
echo "${dev}"
|
||||
[[ "${1}" ]] && echo "${1}"
|
||||
fi
|
||||
|
@ -66,7 +66,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}| grep -q "linux_raid_member" && ! ${_LSBLK} FSTYPE "${part}| grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}| grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE -s "${part}| grep -q "iso9660" && ! 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)$"; then
|
||||
if ! ${_LSBLK} FSTYPE "${part}" | grep -q "linux_raid_member" && ! ${_LSBLK} FSTYPE "${part}" | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" | grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE -s "${part}" | grep -q "iso9660" && ! 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)$"; then
|
||||
echo "${part}"
|
||||
[[ "${1}" ]] && echo "${1}"
|
||||
fi
|
||||
|
@ -86,7 +86,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 -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${dev}| grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE "${dev}" -| grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -| grep -q "ddf_raid_member" && ! find "$dev"*p* -type f -exec echo {} \; 2>/dev/null; then
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS" && ! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "ddf_raid_member" && ! find "$dev"*p* -type f -exec echo {} \; 2>/dev/null; then
|
||||
echo "${dev}"
|
||||
[[ "${1}" ]] && echo "${1}"
|
||||
fi
|
||||
|
@ -109,7 +109,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 -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}| 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}" -| grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -| grep -q "ddf_raid_member"; then
|
||||
if ! ${_LSBLK} FSTYPE "${part}" | grep -q "LVM2_member" && ! ${_LSBLK} FSTYPE "${part}" | 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 | grep -q "isw_raid_member" && ! ${_LSBLK} FSTYPE "${dev}" -s | grep -q "ddf_raid_member"; then
|
||||
echo "${part}"
|
||||
[[ "${1}" ]] && echo "${1}"
|
||||
fi
|
||||
|
@ -164,7 +164,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$" && ! ${_LSBLK} FSTYPE "${dev}| grep -q "LVM2_member$" && ! ${_LSBLK} FSTYPE "${dev}| grep -q "linux_raid_member$" && ! ${_LSBLK} TYPE "${dev}| grep -q "raid.*$"; then
|
||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "crypto_LUKS$" && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "LVM2_member$" && ! ${_LSBLK} FSTYPE "${dev}" | grep -q "linux_raid_member$" && ! ${_LSBLK} TYPE "${dev}" | grep -q "raid.*$"; then
|
||||
echo "${dev}"
|
||||
[[ "${1}" ]] && echo "${1}"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue