X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fpath_id%2Fpath_id;h=d21dea70117b8fb91fe28fc80f42d504aedc73af;hb=9bd66b9dbf5387a9b68c64742daefd07198d2193;hp=7a37700289d89841a0d54367835592e4e50a48e4;hpb=1d918b50cddc975abbfd06af134a6d843d9bc7f0;p=elogind.git

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index 7a3770028..d21dea701 100755
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -95,7 +95,11 @@ handle_pci () {
 				;;
 		esac
 	done
-	d="pci-$pci_id-$d"
+	if [ "$d" ]; then
+		d="pci-$pci_id-$d"
+	else
+		d="pci-$pci_id"
+	fi
 	D="$host_dev_path"
 	RESULT=0
 }
@@ -250,7 +254,7 @@ handle_fc () {
 	fc_tgt_lun="${fc_tgt_hcil##*:}"
 	fc_tgt_path="${DEV%/*}"
 	fc_tgt_num="${fc_tgt_path##*/}"
-	fc_tgt_dev="${fc_tgt_path}/fc_transport:${fc_tgt_num}"
+	fc_tgt_dev="${fc_tgt_path}/fc_transport/${fc_tgt_num}"
 	if [ -e "$fc_tgt_dev/port_name" ]; then
 		read wwpn < $fc_tgt_dev/port_name
 	fi
@@ -281,44 +285,46 @@ handle_sas () {
 	: handle_sas $*
 	local DEV=$1
 	local cil adapter controller_dev
+	local lun
+	lun=${DEV##*:}
 	# SAS device
-	sas_host_path="${DEV%%/port*}"
-	sas_phy_path="${DEV#*/host*/}"
-	sas_phy_path="${sas_phy_path%%/target*}"
-	sas_phy_id="${sas_phy_path%%/*}"
-	sas_phy_id="${sas_phy_id##*port-}"
-	sas_port_id="${sas_phy_path%%/end_device*}"
-	sas_port_id="${sas_port_id##*port-}"
-	sas_end_id="${sas_phy_path##*end_device-}"
-	sas_phy_dev="/sys/class/sas_phy/phy-${sas_phy_id}"
-	if [ -e "$sas_phy_dev/sas_address" ]; then
-		read phy_address < $sas_phy_dev/sas_address
-		read phy_id < $sas_phy_dev/phy_identifier
-	fi
-	if [ -z "$phy_address" ] ; then
+	sas_end_path="${DEV%%/target*}"
+	sas_host_path="${sas_end_path%%/port*}"
+	sas_phy_path="${sas_end_path#*/host*/}"
+	sas_phy_path="${sas_phy_path%%/*}"
+	sas_phy_path="${sas_host_path}/${sas_phy_path}"
+
+	sas_phy_id=255
+	for phy in $sas_phy_path/phy-*/sas_phy/phy-* ; do
+		if [ -d "$phy" ] ; then
+			read phy_id < $phy/phy_identifier
+			if [ $phy_id -lt $sas_phy_id ]; then
+				sas_phy_id=$phy_id
+			fi
+		fi
+	done
+
+	if [ $sas_phy_id -eq 255 ] ; then
 		: no initiator address
 		D=
 		RESULT=1
 		return
 	fi
+
+	sas_port_id="${sas_phy_path##*/port-}"
 	sas_port_dev="/sys/class/sas_port/port-${sas_port_id}"
 	if [ -e "$sas_port_dev/num_phys" ] ; then
 		read phy_port < $sas_port_dev/num_phys
 	fi
-	if [ -z "$phy_port" ] ; then
-		: no initiator address
-		D=
-		RESULT=1
-		return
-	fi
-	sas_phy_address="$phy_address:$phy_port:$phy_id"
+
+	sas_end_id="${sas_end_path##*end_device-}"
 	sas_end_dev="/sys/class/sas_device/end_device-${sas_end_id}"
 	if [ -e "$sas_end_dev/sas_address" ]; then
 		read end_address < $sas_end_dev/sas_address
 		read end_id < $sas_end_dev/phy_identifier
 	fi
 	if [ -z "$end_address" ] ; then
-		: no initiator address
+		: no end device address
 		D=
 		RESULT=1
 		return
@@ -326,7 +332,7 @@ handle_sas () {
 	sas_end_address="$end_address:$end_id"
 	controller_dev="${sas_host_path%/host[0-9]*}"
 	# SAS devices are always endpoints
-	d="sas-${sas_phy_address}-${sas_end_address}"
+	d="sas-phy${sas_phy_id}:${phy_port}-${sas_end_address}-lun$lun"
 	D="$controller_dev"
 	RESULT=0
 }
@@ -511,6 +517,9 @@ handle_device () {
 			*/host[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*)
 				handle_scsi "$D"
 				;;
+			*/ttyUSB*)
+				D=${D%/ttyUSB*}
+				;;
 			*/usb[0-9]*/[0-9]*/*)
 				handle_usb "$D"
 				;;