From 401d883446ec52d89d1f8f46e1b385280e3b8565 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 26 Jan 2022 18:44:53 +0100
Subject: [PATCH] fix blockdevices

---
 usr/bin/archboot-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index c330dc92f..521772fa4 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -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
@@ -264,7 +264,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" || sfdisk -l 2>/dev/null | grep -q "${part}" | grep "Extended$" || sfdisk -l 2>/dev/null | grep -q "${part}" | grep "(LBA)$" || echo "${part}" | grep -q "[a-z]$(parted -s "$(${_LSBLK} PKNAME "${part}")" print 2>/dev/null | grep -q bios_grub | cut -d " " -f 2)$" || ${_LSBLK} FSTYPE -s "${part}" | grep -q "iso9660"); then
+        if ! (${_LSBLK} FSTYPE "${part}" | grep "linux_raid_member" || ${_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)$" || echo "${part}" | grep "[a-z]$(parted -s "$(${_LSBLK} PKNAME "${part}")" print 2>/dev/null | grep bios_grub | cut -d " " -f 2)$" || ${_LSBLK} FSTYPE -s "${part}" | grep "iso9660"); then
             echo "${part}"
             [[ "${1}" ]] && echo "${1}"
         fi