Fix ofpath 2.6 /proc/scsi check

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index b6521649003142324e578280647c6987a9316d58..58bb6f4b98953f5c7712743eadc04d51e803c6f7 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -3,7 +3,7 @@
 ###############################################################################
 ##
 ## ofpath: determine OpenFirmware path from unix device node
-## Copyright (C) 2000, 2001, 2002 Ethan Benson
+## Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson
 ##
 ## Portions based on show_of_path.sh:
 ##
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.3-rc4
+VERSION=1.0.5-UNRELEASED_UNSUPPORTED
 DEBUG=0
 export LC_COLLATE=C
 
@@ -39,7 +39,7 @@ echo \
 Written by Ethan Benson
 Portions based on show_of_path.sh written by Olaf Hering
 
-Copyright (C) 2000, 2001, 2002 Ethan Benson
+Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson
 Portions Copyright (C) 2000 Olaf Hering
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -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=n"
+                   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"
                ;;