diff options
| author | Jake Buchholz <tomalok@gmail.com> | 2019-02-15 18:09:59 -0800 |
|---|---|---|
| committer | Mike Crute <crutem@amazon.com> | 2019-02-23 20:24:32 -0800 |
| commit | d92bbfc7c98655640caf5d7a05f64ec4273950e2 (patch) | |
| tree | dfa11f245b7c68d228a471de6c5ffb746ae472dc | |
| parent | cfa0bdebad22490ed08e712238d57d49fb64310a (diff) | |
| download | alpine-ec2-ami-d92bbfc7c98655640caf5d7a05f64ec4273950e2.tar.bz2 alpine-ec2-ami-d92bbfc7c98655640caf5d7a05f64ec4273950e2.tar.xz alpine-ec2-ami-d92bbfc7c98655640caf5d7a05f64ec4273950e2.zip | |
fix nvme-ebs-links
Ensure that the EBS volume alias matches what we expect it to be.
Should fix issue #40.
| -rwxr-xr-x | nvme/nvme-ebs-links | 7 |
1 files changed, 6 insertions, 1 deletions
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 | |||
| 7 | BASE=$(echo $MDEV | sed -re 's/^(nvme[0-9]+n[0-9]+).*/\1/') | 7 | BASE=$(echo $MDEV | sed -re 's/^(nvme[0-9]+n[0-9]+).*/\1/') |
| 8 | PART=$(echo $MDEV | sed -re 's/nvme[0-9]+n[0-9]+p?//g') | 8 | PART=$(echo $MDEV | sed -re 's/nvme[0-9]+n[0-9]+p?//g') |
| 9 | until [ -n "$EBS" ]; do | 9 | until [ -n "$EBS" ]; do |
| 10 | EBS=$(/usr/sbin/nvme id-ctrl "/dev/$BASE" -b 2>/dev/null | dd bs=32 skip=96 count=1 2>/dev/null | tr -d ' ') | 10 | EBS=$( |
| 11 | /usr/sbin/nvme id-ctrl "/dev/$BASE" -b 2>/dev/null | | ||
| 12 | dd bs=32 skip=96 count=1 2>/dev/null | | ||
| 13 | sed -nre '/^(s|xv)d[a-z]{1,2} +$/p' | | ||
| 14 | tr -d ' ' | ||
| 15 | ) | ||
| 11 | done | 16 | done |
| 12 | EBS=${EBS#/dev/}$PART | 17 | EBS=${EBS#/dev/}$PART |
| 13 | ln -sf "$MDEV" "${EBS/xvd/sd}" | 18 | ln -sf "$MDEV" "${EBS/xvd/sd}" |