path_id: fix an harmless syntax error

[elogind.git] / extras / path_id / path_id

diff --git a/extras/path_id/path_id b/extras/path_id/path_id
index 913c4909f774aeacfe18dd8ee390c0a10bf3e927..a9182af6e07ba0674bea9d8447d682ed57f5d58d 100644 (file)
--- a/extras/path_id/path_id
+++ b/extras/path_id/path_id
@@ -220,7 +220,7 @@ handle_scsi () {
 }
 
 handle_firewire () {
-       :handle_firewire $*
+       : handle_firewire $*
        local DEV=$1
        if [ -f "$D/ieee1394_id" ] ; then
                read ieee1394_id < $D/ieee1394_id
@@ -252,6 +252,7 @@ handle_fc () {
        fi
        if [ -z "$wwpn" ] ; then
                : no WWPN
+               D=
                RESULT=1
                return
        fi
@@ -290,6 +291,7 @@ handle_sas () {
        fi
        if [ -z "$phy_address" ] ; then
                : no initiator address
+               D=
                RESULT=1
                return
        fi
@@ -301,6 +303,7 @@ handle_sas () {
        fi
        if [ -z "$rphy_address" ] ; then
                : no initiator address
+               D=
                RESULT=1
                return
        fi
@@ -312,6 +315,61 @@ handle_sas () {
        RESULT=0
 }
 
+handle_iscsi() {
+       local DEV=$1
+       local iscsi_session_dir
+       local iscsi_session iscsi_session_path
+       local iscsi_connection iscsi_connection_path
+       # iSCSI device
+       iscsi_session_dir="${DEV%%/target*}"
+       iscsi_session="${iscsi_session_dir##*/}"
+       iscsi_session_path=/sys/class/iscsi_session/${iscsi_session}
+       if [ ! -d "$iscsi_session_path" ] ; then
+           : no iSCSI session path
+           RESULT=1
+           return
+       fi
+       # Currently we're not doing MC/S
+       for conn in ${iscsi_session_dir}/connection* ; do
+           iscsi_conn_num=${conn##*:}
+           if [ "$iscsi_conn_num" = '0' ] ; then
+               iscsi_connection=$(basename $conn)
+           fi
+       done
+       if [ -z "$iscsi_connection" ] ; then
+           : no iSCSI connection found
+           RESULT=1
+           return
+       fi
+       iscsi_connection_path=/sys/class/iscsi_connection/${iscsi_connection}
+       if [ ! -d "$iscsi_connection_path" ] ; then
+           : no iSCSI connection path
+           RESULT=1
+           return
+       fi
+       if [ -e "${iscsi_session_path}/targetname" ]; then
+           read iscsi_tgtname < ${iscsi_session_path}/targetname
+       fi
+       if [ -z "$iscsi_tgtname" ] ; then
+           : No iSCSI Targetname
+           RESULT=1
+           return
+       fi
+       if [ -e "${iscsi_connection_path}/persistent_address" ] ; then
+           read iscsi_address < ${iscsi_connection_path}/persistent_address
+       fi
+       if [ -z "$iscsi_address" ] ; then
+           : No iSCSI Target address
+           RESULT=1
+           return
+       fi
+       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}"
+       RESULT=0
+}
+
 handle_usb () {
 : handle_usb $*
        local DEV=$1
@@ -349,30 +407,35 @@ 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
-                       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
+       case "$DEVPATH" in
+               /devices/*)
+                       # new sysfs layout
+                       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%/*}"
+                               fi
+                               cd $full_sysfs_path
                        fi
-               fi
-               cd $full_sysfs_path/device
-       fi
+                       ;;
+               *)
+                       # old sysfs 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
+                               fi
+                       fi
+                       cd $full_sysfs_path/device
+                       ;;
+       esac
        full_sysfs_device_path="`pwd -P`"
        cd "$OPWD"
        D=$full_sysfs_device_path
@@ -413,6 +476,10 @@ handle_device () {
                        */fw-host[0-9]*/*)
                                handle_firewire "$D"
                                ;;
+                       */session[0-9]*/*)
+                               handle_iscsi "$D"
+                               D=
+                               ;;
                        */host[0-9]*/[0-9]*:[0-9]*:[0-9]*:[0-9]*)
                                handle_scsi "$D"
                                ;;
@@ -438,7 +505,7 @@ handle_device () {
                                ;;
                esac
        done
-       if [ "$TYPE" == "scsi_tape" ] ; then
+       if [ "$TYPE" = "scsi_tape" ] ; then
                devname=${full_sysfs_path##*/}
                rewind="${devname%%st*}"
                mode="${devname##*st}"