rpms/udev/devel udev-095-path_id2.patch, NONE, 1.1 udev.spec, 1.189, 1.190

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11036

Modified Files:
	udev.spec 
Added Files:
	udev-095-path_id2.patch 
Log Message:
- fixed path_id script (bug #207139)


udev-095-path_id2.patch:
 path_id |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

--- NEW FILE udev-095-path_id2.patch ---
--- udev-095/extras/path_id/path_id     2006-07-04 12:34:55.000000000 +0200
+++ udev-100/extras/path_id/path_id     2006-09-07 11:32:45.000000000 +0200
@@ -278,15 +278,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 +297,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
 }
@@ -470,7 +482,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]*/*)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- udev.spec	3 Oct 2006 20:18:25 -0000	1.189
+++ udev.spec	4 Oct 2006 08:24:32 -0000	1.190
@@ -3,7 +3,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 095
-Release: 12
+Release: 13
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -26,6 +26,7 @@
 Patch10: udev-095-longcomment.patch
 Patch11: udev-095-selinux.patch
 Patch12: udev-095-path_id.patch
+Patch13: udev-095-path_id2.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -73,6 +74,7 @@
 %patch10 -p1 -b .longcomment
 %patch11 -p1 -b .selinux
 %patch12 -p1 -b .pathid
+%patch13 -p1 -b .pathid2
 
 %build
 
@@ -328,6 +330,9 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Oct  4 2006 Harald Hoyer <harald at redhat.com> - 095-13
+- fixed path_id script (bug #207139)
+
 * Tue Oct  3 2006 Jeremy Katz <katzj at redhat.com> - 095-12
 - autoload mmc_block (#171687)