X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fpath_id%2Fpath_id;h=0fad30cfb257d3468ce047efaf1776994be04f3c;hp=f9b3d5a73fed89fe5d736e81fd8e5ce1a7e39d51;hb=e32135825f70ec1f1c449a9201a80917abe5d842;hpb=ecc527e0becc01811220fdc9b433c51dc97569c7

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
old mode 100644
new mode 100755
index f9b3d5a73..0fad30cfb
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -10,13 +10,6 @@
 #	This program is free software; you can redistribute it and/or modify it
 #	under the terms of the GNU General Public License as published by the
 #	Free Software Foundation version 2 of the License.
-#
-# to be called from a udev rule to return the name for a symlink
-#	DEVPATH=<devpath>; path_id
-#	path_id <devpath>
-
-# examples for all block devices on a system:
-#	for i in `find /sys/class/block`; do DEVPATH="`echo $i | sed -e 's@^/sys\|/dev@@g'`"; path_id; done
 
 SYSFS=/sys
 RESULT=1
@@ -81,6 +74,17 @@ handle_pci () {
 	DEV=${PWD}
 	pci_id=${DEV##*/}
 	host_dev_path=$DEV
+
+	# cciss devices don't have a separate sysfs node
+	for blk_link in block*; do
+	    if [ -L "$blk_link" ]; then
+		case "$blk_link" in
+		    *cciss*)
+			d=cciss-${blk_link#*cciss\!}
+			;;
+		esac
+	    fi
+	done
 	while [ ! -z "$host_dev_path" ] ; do
 		case "$host_dev_path" in
 			*/pci[0-9]*)
@@ -91,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
 }
@@ -220,7 +228,7 @@ handle_scsi () {
 }
 
 handle_firewire () {
-	:handle_firewire $*
+	: handle_firewire $*
 	local DEV=$1
 	if [ -f "$D/ieee1394_id" ] ; then
 		read ieee1394_id < $D/ieee1394_id
@@ -278,15 +286,17 @@ handle_sas () {
 	local DEV=$1
 	local cil adapter controller_dev
 	# SAS device
-	sas_host_path="${DEV%%/phy*}"
+	sas_host_path="${DEV%%/port*}"
 	sas_phy_path="${DEV#*/host*/}"
 	sas_phy_path="${sas_phy_path%%/target*}"
 	sas_phy_id="${sas_phy_path%%/*}"
-	sas_rphy_id="${sas_phy_path##*/}"
-	sas_phy_dev="/sys/class/sas_phy/${sas_phy_id}"
+	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_port < $sas_phy_dev/port_identifier
 		read phy_id < $sas_phy_dev/phy_identifier
 	fi
 	if [ -z "$phy_address" ] ; then
@@ -295,22 +305,32 @@ handle_sas () {
 		RESULT=1
 		return
 	fi
+	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_rphy_dev="/sys/class/sas_device/${sas_rphy_id}"
-	if [ -e "$sas_rphy_dev/sas_address" ]; then
-		read rphy_address < $sas_rphy_dev/sas_address
-		read rphy_id < $sas_rphy_dev/phy_identifier
+	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 "$rphy_address" ] ; then
+	if [ -z "$end_address" ] ; then
 		: no initiator address
 		D=
 		RESULT=1
 		return
 	fi
-	sas_rphy_address="$rphy_address:$rphy_id"
+	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_rphy_address}"
+	d="sas-${sas_phy_address}-${sas_end_address}"
 	D="$controller_dev"
 	RESULT=0
 }
@@ -320,6 +340,7 @@ handle_iscsi() {
 	local iscsi_session_dir
 	local iscsi_session iscsi_session_path
 	local iscsi_connection iscsi_connection_path
+	local iscsi_scsi_lun
 	# iSCSI device
 	iscsi_session_dir="${DEV%%/target*}"
 	iscsi_session="${iscsi_session_dir##*/}"
@@ -366,7 +387,8 @@ handle_iscsi() {
 	if [ -e "${iscsi_connection_path}/persistent_port" ] ; then
 	    read iscsi_port < ${iscsi_connection_path}/persistent_port
 	fi
-	d="ip-${iscsi_address}:${iscsi_port}-iscsi-${iscsi_tgtname}"
+	iscsi_scsi_lun="${DEV##*:}"
+	d="ip-${iscsi_address}:${iscsi_port}-iscsi-${iscsi_tgtname}-lun-${iscsi_scsi_lun}"
 	RESULT=0
 }
 
@@ -407,32 +429,47 @@ handle_usb () {
 
 handle_device () {
 	full_sysfs_path="$SYSFS$DEVPATH"
-	if [ -L $full_sysfs_path/subsystem ]; then
-		# new sysfs block layout
-		full_sysfs_path="${full_sysfs_path%/*}"
-		cd "$full_sysfs_path/subsystem";
-		subsys="`pwd -P`"
-		cd "$OPWD"
-		subsys="${subsys##*/}"
-		if [ "$subsys" = "block" ]; then
-			# parent is "block", it's a partition, move one up
+	case "$DEVPATH" in
+		/devices/*)
 			full_sysfs_path="${full_sysfs_path%/*}"
-		fi
-		cd $full_sysfs_path
-	else
-		# old sysfs block layout
-		if [ ! -L $full_sysfs_path/device ] ; then
-			if [ -f $full_sysfs_path/range ] ; then return ; fi
-			full_sysfs_path="${full_sysfs_path%/*}"
-			: full_sysfs_path "$full_sysfs_path"
-			if [ ! -L $full_sysfs_path/device -o ! -f $full_sysfs_path/dev ] ; then
-				return
+			# skip parent device of the same subsystem
+			if [ -L $full_sysfs_path/subsystem ]; then
+				cd "$full_sysfs_path/subsystem";
+				subsys="`pwd -P`"
+				cd "$OPWD"
+				subsys="${subsys##*/}"
+				if [ "$subsys" = "$TYPE" ]; then
+					: skip same subsystem parent
+					full_sysfs_path="${full_sysfs_path%/*}"
+				fi
 			fi
-		fi
-		cd $full_sysfs_path/device
-	fi
+			# skip subsystem directory
+			subsys="${full_sysfs_path##*/}"
+			if [ "$subsys" = "$TYPE" ]; then
+				: skip subsystem directory
+				full_sysfs_path="${full_sysfs_path%/*}"
+			fi
+			cd $full_sysfs_path
+			;;
+		*)
+			# old sysfs layout
+			if [ ! -L $full_sysfs_path/device ]; then
+				full_sysfs_path="${full_sysfs_path%/*}"
+				: full_sysfs_path "$full_sysfs_path"
+				if [ ! -L $full_sysfs_path/device -o ! -f $full_sysfs_path/dev ]; then
+					return
+				fi
+			fi
+			if [ -L $full_sysfs_path/device/device ]; then
+				cd $full_sysfs_path/device/device
+			else
+				cd $full_sysfs_path/device
+			fi
+			;;
+	esac
 	full_sysfs_device_path="`pwd -P`"
 	cd "$OPWD"
+
 	D=$full_sysfs_device_path
 	while [ ! -z "$D" ] ; do
 		case "$D" in
@@ -465,7 +502,7 @@ handle_device () {
 			*/rport-[0-9]*:[0-9]*-[0-9]*/*)
 				handle_fc "$D"
 				;;
-			*/phy-[0-9]*:[0-9]*/*)
+			*/end_device-[0-9]*:[0-9]*:[0-9]*/*)
 				handle_sas "$D"
 				;;
 			*/fw-host[0-9]*/*)
@@ -516,7 +553,7 @@ handle_device () {
 				;;
 			*)
 				mode=""
-			   ;;
+				;;
 		esac
 		if [ "$d" ]; then
 			d="$d-${rewind}st${mode}"
@@ -524,22 +561,9 @@ handle_device () {
 	fi
 }
 
-case "$TYPE" in
-	block)
-		handle_device
-		echo "ID_PATH=$d"
-		;;
-	scsi_tape)
-		handle_device
-		echo "ID_PATH=$d"
-		;;
-	input)
-		handle_device
-		echo "ID_PATH=$d"
-		;;
-	*)
-		RESULT=1
-		;;
-esac
-
-exit $RESULT
+handle_device
+if [ -z "$d" ]; then
+	exit 1
+fi
+echo "ID_PATH=$d"
+exit 0