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

diff --git a/ybin/ofpath b/ybin/ofpath
index e9c29aa..e45ec87 100755
--- 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.5-UNRELEASED_UNSUPPORTED
+VERSION=1.0.6
 DEBUG=0
 export LC_COLLATE=C
 
@@ -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"
@@ -297,7 +297,7 @@ scsi_ofpath()
 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
 	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
 	    ;;
-	ata_k2)
+	ata_k2|sata_svw)
 	    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)"
@@ -323,11 +323,32 @@ ide_ofpath()
 	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
 	return 1
     fi
-    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
+
+    case "$(uname -r)" in
+	2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*)
+	    echo "$PRG: Linux kernel `uname -r` is not supported"
+	    return 1
+	    ;;
+	2.6.*|2.7.*)
+	    if ! (grep -q '.* .* sysfs ' /proc/mounts 2> /dev/null) ; then
+		echo 1>&2 "$PRG: sysfs must be mounted for ofpath to support this system"
+		return 1
+	    fi
+	    local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)"
+	    if [ -z "$SYS" -o ! -d "$SYS" ] ; then
+		echo 2>&1 "$PRG: Unable to determine sysfs mountpoint"
+		return 1
+	    fi
+	    local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
+	    ;;
+	*)
+	    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
+	    ;;
+    esac
 
     if [ ! -f "$OF1275IDE" ] ; then
 	case "$(cat /proc/device-tree/model)" in
-	    "PowerMac3,6")
+	    PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|RackMac*)
 		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."
@@ -372,8 +393,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 +889,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