From d92bbfc7c98655640caf5d7a05f64ec4273950e2 Mon Sep 17 00:00:00 2001
From: Jake Buchholz <tomalok@gmail.com>
Date: Fri, 15 Feb 2019 18:09:59 -0800
Subject: fix nvme-ebs-links

Ensure that the EBS volume alias matches what we expect it to be.
Should fix issue #40.
---
 nvme/nvme-ebs-links | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nvme/nvme-ebs-links b/nvme/nvme-ebs-links
index c197a73..f3e0a0a 100755
--- a/nvme/nvme-ebs-links
+++ b/nvme/nvme-ebs-links
@@ -7,7 +7,12 @@ case $ACTION in
     BASE=$(echo $MDEV | sed -re 's/^(nvme[0-9]+n[0-9]+).*/\1/')
     PART=$(echo $MDEV | sed -re 's/nvme[0-9]+n[0-9]+p?//g')
     until [ -n "$EBS" ]; do
-      EBS=$(/usr/sbin/nvme id-ctrl "/dev/$BASE" -b 2>/dev/null | dd bs=32 skip=96 count=1 2>/dev/null | tr -d ' ')
+      EBS=$(
+        /usr/sbin/nvme id-ctrl "/dev/$BASE" -b 2>/dev/null |
+        dd bs=32 skip=96 count=1 2>/dev/null |
+        sed -nre '/^(s|xv)d[a-z]{1,2} +$/p' |
+        tr -d ' '
+      )
     done
     EBS=${EBS#/dev/}$PART
     ln -sf "$MDEV" "${EBS/xvd/sd}"
-- 
cgit v1.2.3