root2 partitions, various improvements

[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 e3443898795c52d5c8569c02e538b8765c23ecf2..056a83f356395e3af43e924374f29a32cc8af963 100755 (executable)
--- a/fai/config/distro-install-common/devbyid
+++ b/fai/config/distro-install-common/devbyid
@@ -5,10 +5,11 @@
 
 short_dev=$1
 
-# devices are identified by model+serial num,
-# and wwn. model+serial gives me more info, so use that.
+# 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/!(wwn*); do
+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"