commit udev for openSUSE:Factory
Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Thu Dec 18 15:20:47 CET 2008. -------- --- udev/udev.changes 2008-11-26 15:47:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2008-12-18 13:58:59.669322000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 18 13:58:03 CET 2008 - kay.sievers@novell.com + +- fix path_id for SAS devices (bnc#459934) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- udev-path_id-sas.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.Z18610/_old 2008-12-18 15:20:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Z18610/_new 2008-12-18 15:20:20.000000000 +0100 @@ -21,7 +21,7 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 128 -Release: 9 +Release: 10 License: GPL v2 or later Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager @@ -48,6 +48,7 @@ Patch21: udev-path_id-fc.patch Patch22: udev-s390-tape.patch Patch23: udev-cciss.rules +Patch24: udev-path_id-sas.patch %description udev's main task is to create and remove device nodes in /dev when a @@ -145,6 +146,7 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %build # prevent man pages from re-building (xmlto) @@ -328,6 +330,8 @@ /%{_lib}/libvolume_id.so.* %changelog +* Thu Dec 18 2008 kay.sievers@novell.com +- fix path_id for SAS devices (bnc#459934) * Fri Nov 21 2008 kay.sievers@novell.com - fix fibre channel path_id handling (bnc#447275) - load floppy module on ancient systems (bnc#439170) ++++++ udev-path_id-sas.patch ++++++ diff --git a/extras/path_id/path_id b/extras/path_id/path_id index 0fad30c..0e85034 100755 --- a/extras/path_id/path_id +++ b/extras/path_id/path_id @@ -285,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 @@ -330,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 } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de