cloud_storage_udev_rules: Tweaks for RHEL 7

This commit captures alterations from the original CoreOS script.
openshift · Jan 14, 2019 · 75fdf39 · 75fdf39
1 parent 550ed5f
commit 75fdf39
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ansible/roles/cloud_storage_udev_rules/files/cloud_aws_ebs_nvme_id b/ansible/roles/cloud_storage_udev_rules/files/cloud_aws_ebs_nvme_id
@@ -19,7 +19,7 @@ namespace_id() {
 # see https://github.com/coreos/bugs/issues/2399.
 devname() {
     check_udev_aws
-    RAWVOL=$(nvme id-ctrl --raw-binary "$1" | cut -c3073-3104 | tr -s ' ' | sed 's/ $//g')
+    RAWVOL=$(/usr/sbin/nvme id-ctrl --raw-binary "$1" | cut -c3073-3104 | tr -s ' ' | sed 's/ $//g')
     VOL="${RAWVOL#/dev/}"
     if [[ -n "$VOL" ]]; then
         echo "${VOL}"
@@ -31,8 +31,8 @@ devname() {
 # Ensure this is run with proper environment populated by udev,
 # and acting on an AWS EBS device.
 check_udev_aws() {
-    if [ "${ID_MODEL}" != "Amazon Elastic Block Store" ]; then
-        echo 'Stopping due to non-matching ID_MODEL env variable'
+    if [[ "${ID_SERIAL}" != "Amazon Elastic Block Store"* ]]; then
+        echo 'Stopping due to non-matching ID_SERIAL env variable'
         exit 1
     fi
 }