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

diff --git a/ybin/ofpath b/ybin/ofpath
index be3f8cd..287cdb1 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.3-DEVEL_DO_NOT_DISTRIBUTE-patch-36
+VERSION=1.0.3-rc2
 DEBUG=0
 export LC_COLLATE=C
 
@@ -302,6 +302,10 @@ ide_ofpath()
     fi
 
     local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
+    if [ -z "$IDEBUS" ] ; then
+	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
+	return 1
+    fi
     local OF1275IDE="/proc/ide/$IDEBUS/devspec"
 
     if [ ! -f "$OF1275IDE" ] ; then
@@ -315,10 +319,6 @@ ide_ofpath()
 		fi
 		;;
 	    *)
-		if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-		    echo "$PRG: /dev/$DEVNODE: Device not configured"
-		    return 1
-		fi
 		local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
 		if [ -z "$CDROM" ] ; then
 		    if [ "$DEVNODE" = hda ] ; then
@@ -332,15 +332,44 @@ ide_ofpath()
 		;;
 	esac
     else
-	local DEVSPEC="$(cat /proc/ide/$IDEBUS/devspec)"
+	local DEVSPEC="$(cat $OF1275IDE)"
 	[ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
+	if [ -z "$DEVSPEC" ] ; then
+	    echo 1>&2 "$PRG: KERNEL BUG: $OF1275IDE exists, but is empty"
+	    return 1
+	fi
+
+	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
+	    return 1
+	fi
+
+	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+	    ata)
+		local MASTER="/disk@0"
+		local SLAVE="/disk@1"
+		;;
+	    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"
+		;;
+	    *)
+		echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+		return 1
+		;;
+	esac
+
 	case "$DEVNODE" in
 	    hda|hdc|hde|hdg|hdi)
-		echo "${DEVSPEC}/disk@0:$PARTITION"
+		echo "${DEVSPEC}${MASTER}:$PARTITION"
 		return 0
 		;;
 	    hdb|hdd|hdf|hdh|hdj)
-		echo "${DEVSPEC}/disk@1:$PARTITION"
+		echo "${DEVSPEC}${SLAVE}:$PARTITION"
 		return 0
 		;;
 	    *)