From 38b344d22a80a173e50ab992f81b57b872e6da7c Mon Sep 17 00:00:00 2001 From: Cyril Plisko Date: Thu, 29 Nov 2012 15:40:26 +0200 Subject: [PATCH] vdev_id fails to handle complex device topologies While expanding positional parameters shell requires non-single digits to be enclosed in braces. When the SAS topology is non-trivial the number of positional parameters generated internally by vdev_id script (using set -- ...) easily crosses single digit limit and vdev_id fails to generate links. Signed-off-by: Ned Bass Signed-off-by: Brian Behlendorf Closes #1119 --- cmd/vdev_id/vdev_id | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/vdev_id/vdev_id b/cmd/vdev_id/vdev_id index fd8e422..d133e16 100755 --- a/cmd/vdev_id/vdev_id +++ b/cmd/vdev_id/vdev_id @@ -236,7 +236,7 @@ scsi_host_dir="/sys" # Get path up to /sys/.../hostX i=1 while [ $i -le $num_dirs ] ; do - d=$(eval echo \$$i) + d=$(eval echo \${$i}) scsi_host_dir="$scsi_host_dir/$d" echo $d | grep -q -E '^host[0-9]+$' && break i=$(($i + 1)) @@ -246,7 +246,7 @@ if [ $i = $num_dirs ] ; then exit 0 fi -PCI_ID=$(eval echo \$$(($i -1)) | awk -F: '{print $2":"$3}') +PCI_ID=$(eval echo \${$(($i -1))} | awk -F: '{print $2":"$3}') # In sas_switch mode, the directory four levels beneath /sys/.../hostX # contains symlinks to phy devices that reveal the switch port number. In @@ -259,7 +259,7 @@ esac i=$(($i + 1)) while [ $i -le $j ] ; do - port_dir="$port_dir/$(eval echo \$$i)" + port_dir="$port_dir/$(eval echo \${$i})" i=$(($i + 1)) done @@ -273,7 +273,7 @@ PORT=$(( $PHY / $PHYS_PER_PORT )) # attribute. end_device_dir=$port_dir while [ $i -lt $num_dirs ] ; do - d=$(eval echo \$$i) + d=$(eval echo \${$i}) end_device_dir="$end_device_dir/$d" if echo $d | grep -q '^end_device' ; then end_device_dir="$end_device_dir/sas_device/$d" -- 1.8.3.1