X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ybin%2Fofpath;h=a5922bf893417471411f80e48a045da4f71c3c72;hb=941806a910f667c64b8ed55897ff2f5d458bc027;hp=287cdb1b5374eea65ec28814d14514469dbfa312;hpb=c8468c1549669e3f06387ab6a162e5d6498c6de7;p=yaboot.git

diff --git a/ybin/ofpath b/ybin/ofpath
index 287cdb1..a5922bf 100755
--- 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-rc2
+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."
@@ -149,7 +149,7 @@ if (command -v readlink > /dev/null 2>&1) ; then
 else
     readlink()
     {
-        local SYMTARGET="$(v=`ls -l "$2" 2>/dev/null` ; echo ${v##*> })"
+        local SYMTARGET="$(v=`ls -l "$1" 2>/dev/null` ; echo ${v##*> })"
         if [ -n "$SYMTARGET" ] ; then
             echo "$SYMTARGET"
             return 0
@@ -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
@@ -313,6 +330,7 @@ ide_ofpath()
 	    "PowerMac3,6")
 		local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
 		if [ -z "$CDROM" ] ; then
+		    echo 1>&2 "$PRG: WARNING: Your kernel is too old for proper support, device may be innaccurate."
 		    echo "ultra2:$PARTITION"
 		else
 		    echo "cd:$PARTITION"
@@ -345,17 +363,17 @@ 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"
 		;;
-	    pci-ata)
+	    pci-ide|pci-ata)
 		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
 		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)\""
@@ -364,11 +382,11 @@ ide_ofpath()
 	esac
 
 	case "$DEVNODE" in
-	    hda|hdc|hde|hdg|hdi)
+	    hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
 		echo "${DEVSPEC}${MASTER}:$PARTITION"
 		return 0
 		;;
-	    hdb|hdd|hdf|hdh|hdj)
+	    hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp)
 		echo "${DEVSPEC}${SLAVE}:$PARTITION"
 		return 0
 		;;
@@ -850,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