Bump versions to final 1.3.11 release

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 46bd7345bd1989c34fd70f8563485c7982a36b13..a1d74ea03b367e28cb77d5f7b969dc49fff672c3 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.3
+VERSION=1.0.5
 DEBUG=0
 export LC_COLLATE=C
 
@@ -187,6 +187,17 @@ scsiinfo()
 {
     ## see if system has scsi at all
     if [ ! -f /proc/scsi/scsi ] ; then
+       local kver="$(uname -r)"
+       case "$kver" in
+           2.5.*|2.6.*)
+               if [ -d /sys/bus/scsi/devices -a \
+                   -n "$(ls /sys/bus/scsi/devices 2>/dev/null)" ] ; then
+                   echo 1>&2 "$PRG: /proc/scsi/scsi does not exist"
+                   echo 1>&2 "$PRG: Make sure you compiled your kernel with CONFIG_SCSI_PROC_FS=y"
+                   return 1
+               fi
+               ;;
+       esac
        echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
        return 1
     fi
@@ -286,6 +297,12 @@ scsi_ofpath()
            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
            echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
            ;;
+       ata_k2)
+           HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
+                       lgrep "$i" "k2-s-ata" ; done)"
+           DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+           echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk@0:$PARTITION"
+           ;;
        *)
            echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
            return 1
@@ -346,7 +363,7 @@ ide_ofpath()
        fi
 
        case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-           ata)
+           ide|ata)
                local MASTER="/disk@0"
                local SLAVE="/disk@1"
                ;;
@@ -355,8 +372,8 @@ ide_ofpath()
                local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
                ;;
            scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
-               local MASTER="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0)),0"
-               local SLAVE="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1)),0"
+               local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
+               local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
                ;;
            *)
                echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
@@ -851,7 +868,7 @@ if [ `uname -s` != Linux ] ; then
 fi
 
 ## check for ppc, i think uname -m is safe for this...
-if [ `uname -m` != ppc ] ; then
+if [ `uname -m` != ppc -a `uname -m` != ppc64 ] ; then
     echo 1>&2 "$PRG: This utility will only work on PowerPC hardware"
     exit 1
 fi