Merge pull request #40 in MTL/dracut-metal-mdsquash from feature/sas …

…to release/shasta-1.4 * commit 'd01c0c137aa3ccdc99ee3bf39061f8d1e4f3fa0b': Merge pull request #2 from NERSC/main
Cray-HPE · Mar 5, 2021 · a429469 · a429469
2 parents e38984f + d01c0c1
commit a429469
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/90metalmdsquash/metal-md-disks.sh b/90metalmdsquash/metal-md-disks.sh
@@ -11,7 +11,7 @@ type metal_die > /dev/null 2>&1 || . /lib/metal-md-lib.sh
 [ -z "${metal_server:-}" ] && exit 0
 
 # DISKS or RETRY
-md_disks="$(lsblk -l -o SIZE,NAME,TYPE,TRAN | grep -E '(sata|nvme)' | sort -h | awk '{print $2}' | head -n ${metal_disks} | tr '\n' ' ')"
+md_disks="$(lsblk -l -o SIZE,NAME,TYPE,TRAN | grep -E '(sata|nvme|sas)' | sort -h | awk '{print $2}' | head -n ${metal_disks} | tr '\n' ' ')"
 [ -z "${md_disks}" ] && exit 1
 
 # PAVE & GO-AROUND/RETRY

diff --git a/90metalmdsquash/metal-md-lib.sh b/90metalmdsquash/metal-md-lib.sh
@@ -271,7 +271,7 @@ pave() {
     local doomed_vgs='vg_name=~ceph*'
 
     # Select the span of devices we care about; RAID, SATA, and NVME devices/handles.
-    doomed_disks=$(lsblk -l -o SIZE,NAME,TYPE,TRAN | grep -E '(raid|sata|nvme)' | sort -u | awk '{print "/dev/"$2}' | tr '\n' ' ')
+    doomed_disks=$(lsblk -l -o SIZE,NAME,TYPE,TRAN | grep -E '(raid|sata|nvme|sas)' | sort -u | awk '{print "/dev/"$2}' | tr '\n' ' ')
     [ -z "$doomed_disks" ] && echo 0 > /tmp/metalpave.done && return 0
 
     info nothing can be done to stop this except one one thing...