X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ybin%2Fofpath;h=f3d5a9064ab19c13fc484aef03f097a87364b491;hb=a36e22176e6917e0218cd69f6cab014b1c5d7a49;hp=e9c29aaeadeccd4d465e5751d06c884cf8b93f55;hpb=1f0aaa620e99229cb0777c0e438e89f3d7b6e082;p=yaboot.git

diff --git a/ybin/ofpath b/ybin/ofpath
index e9c29aa..f3d5a90 100755
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -193,9 +193,9 @@ scsiinfo()
 		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"
+		    echo 1>&2 "$PRG: Make sure you compiled your kernel with CONFIG_SCSI_PROC_FS=y"
+		    return 1
 		fi
-		return 1
 		;;
 	esac
 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
@@ -372,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)\""
@@ -868,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 -o `uname -m` != pp64 ] ; then
     echo 1>&2 "$PRG: This utility will only work on PowerPC hardware"
     exit 1
 fi