rule_generator: fix enumeration for write_cd_rules

[elogind.git] / extras / path_id / path_id

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
old mode 100644 (file)
new mode 100755 (executable)
index ee26dc1..d21dea7
--- 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
 }
@@ -427,35 +433,45 @@ handle_device () {
        full_sysfs_path="$SYSFS$DEVPATH"
        case "$DEVPATH" in
                /devices/*)
-                       # new sysfs layout
+                       full_sysfs_path="${full_sysfs_path%/*}"
+                       # skip parent device of the same subsystem
                        if [ -L $full_sysfs_path/subsystem ]; then
-                               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
-                               full_sysfs_path="${full_sysfs_path%/*}"
+                               if [ "$subsys" = "$TYPE" ]; then
+                                       : skip same subsystem parent
+                                       full_sysfs_path="${full_sysfs_path%/*}"
                                fi
-                               cd $full_sysfs_path
                        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
-                               if [ -f $full_sysfs_path/range ] ; then return ; fi
+                       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
+                               if [ ! -L $full_sysfs_path/device -o ! -f $full_sysfs_path/dev ]; then
                                        return
                                fi
                        fi
-                       cd $full_sysfs_path/device
+                       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
@@ -501,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"
                                ;;
@@ -539,7 +558,7 @@ handle_device () {
                                ;;
                        *)
                                mode=""
-                          ;;
+                               ;;
                esac
                if [ "$d" ]; then
                        d="$d-${rewind}st${mode}"
@@ -547,22 +566,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