t11 and new partitioner fixes

[automated-distro-installer] / fai / config / distro-install-common / devbyid

diff --git a/fai/config/distro-install-common/devbyid b/fai/config/distro-install-common/devbyid
index 056a83f356395e3af43e924374f29a32cc8af963..af97643fd5753c44426252eea7dd7876f697cc53 100755 (executable)
--- a/fai/config/distro-install-common/devbyid
+++ b/fai/config/distro-install-common/devbyid
@@ -4,17 +4,21 @@
 # output: /dev/disk/by-id/model+serial, or if no link exists, the same as input
 
 short_dev=$1
+if [[ ! -e $short_dev ]]; then
+  echo "devbyid: error: argument=$short_dev does not exist"
+  exit 1
+fi
 
 # devices are identified by model+serial num
 # and for ssd/hdd: wwn, and for nvme: eui.
 # model+serial gives me more info, so use that.
 shopt -s extglob
 for id in /dev/disk/by-id/!(nvme-eui*|wwn*); do
-    [[ -e $id ]] || break # if we matched nothing
-    if [[ $(readlink -f $id) == "$short_dev" ]]; then
-        printf '%s\n' "$id"
-        exit
-    fi
+  [[ -e $id ]] || break # if we matched nothing
+  if [[ $(readlink -f $id) == "$short_dev" ]]; then
+    printf '%s\n' "$id"
+    exit
+  fi
 done
 # a vm may not have a by-id link.
 printf '%s\n' "$short_dev"