From f5639db1ff352e22cc5c42efadbc35ed4621d74d Mon Sep 17 00:00:00 2001 From: Russell Bunch Date: Fri, 5 Mar 2021 09:07:52 -0600 Subject: [PATCH] Merge pull request #12 in MTL/dracut-metal-luksetcd from integration to main * commit '72133061d0093954237a9bfefb96f03dadb51e6a': allow sas disks to be detected --- 93metalluksetcd/metal-luksetcd-disk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/93metalluksetcd/metal-luksetcd-disk.sh b/93metalluksetcd/metal-luksetcd-disk.sh index 888a464..27e5d0b 100755 --- a/93metalluksetcd/metal-luksetcd-disk.sh +++ b/93metalluksetcd/metal-luksetcd-disk.sh @@ -10,7 +10,7 @@ type make_etcd > /dev/null 2>&1 || . /lib/metal-luksetcd-lib.sh # DISKS or RETRY # Ignore whatever was selected for the overlay by starting +1 from that index. disk_index=$((${metal_disks:-2} + 1)) -etcd="$(lsblk -b -l -o SIZE,NAME,TYPE,TRAN | grep -E '(sata|nvme)' | sort -h | awk '{print $1 " " $2}' | tail -n +${disk_index} | tr '\n' ' ')" +etcd="$(lsblk -b -l -o SIZE,NAME,TYPE,TRAN | grep -E '(sata|nvme|sas)' | sort -h | awk '{print $1 " " $2}' | tail -n +${disk_index} | tr '\n' ' ')" [ -z "${etcd}" ] && exit 1 etcd_size="$(echo $etcd | awk '{print $1}')" # 524288000000 is 0.5 TiB; required for this disk.