X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fofpath;h=981da9d22b4cdaf0ea28e45f43cb106e6668e0e8;hp=dc6925fb3067d24816bc33085ec9b8bf9eec0e07;hb=33ce5d317965c250cf097a0e287e62dbdabe76e9;hpb=b58b7f84f40f96f61a1d5fc1f88a1abd9c1a4193

diff --git a/ybin/ofpath b/ybin/ofpath
index dc6925f..981da9d 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.2
+VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-38
 DEBUG=0
 export LC_COLLATE=C
 
@@ -143,6 +143,22 @@ lgrep()
     return 0
 }
 
+## if readlink is missing use a kludge
+if (command -v readlink > /dev/null 2>&1) ; then
+    true
+else
+    readlink()
+    {
+        local SYMTARGET="$(v=`ls -l "$2" 2>/dev/null` ; echo ${v##*> })"
+        if [ -n "$SYMTARGET" ] ; then
+            echo "$SYMTARGET"
+            return 0
+        else
+            return 1
+        fi
+    }
+fi
+
 ## a function to print relevant scsi host path when there is more then
 ## one.  this function also takes care of stripping off the trailing
 ## /compatible.
@@ -278,6 +294,85 @@ scsi_ofpath()
     return 0
 }
 
+ide_ofpath()
+{
+    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
+	echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
+	return 1
+    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
+	case "$(cat /proc/device-tree/model)" in
+	    "PowerMac3,6")
+		local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
+		if [ -z "$CDROM" ] ; then
+		    echo "ultra2:$PARTITION"
+		else
+		    echo "cd:$PARTITION"
+		fi
+		;;
+	    *)
+		local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
+		if [ -z "$CDROM" ] ; then
+		    if [ "$DEVNODE" = hda ] ; then
+			echo "hd:$PARTITION"
+		    else
+			echo "ultra1:$PARTITION"
+		    fi
+		else
+		    echo "cd:$PARTITION"
+		fi
+		;;
+	esac
+    else
+	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
+
+	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+	    ata)
+		local CHANNEL=""
+		;;
+	    pci-ata)
+		if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+		    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
+		    return 1
+		fi
+		local CHANNEL="/@$(cat /proc/ide/${IDEBUS}/channel)"
+		;;
+	    *)
+		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}${CHANNEL}/disk@0:$PARTITION"
+		return 0
+		;;
+	    hdb|hdd|hdf|hdh|hdj)
+		echo "${DEVSPEC}${CHANNEL}/disk@1:$PARTITION"
+		return 0
+		;;
+	    *)
+		echo 1>&2 "$PRG: /dev/$DEVNODE is not supported"
+		return 1
+		;;
+	esac
+    fi
+}
+
 ## figure out the OpenFirmware device path for newworld macs.
 ## sd* scsi disks , hd* ide disks.
 newworld()
@@ -288,7 +383,7 @@ newworld()
 		true
 	    else
 		echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
-		echo 1>&2 "$PRG: The yaboot FAQ can be found here: http://www.alaska.net/~erbenson/doc"
+		echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
 		return 1
 	    fi
 
@@ -299,30 +394,8 @@ newworld()
 	    ## find the actual OF path.	
 	    scsi_ofpath || return 1
 	    ;;
-	hda*)
-	    local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep hda)"
-	    if [ -z "$CDROM" ] ; then
-		echo "hd:$PARTITION"
-	    else
-		echo "cd:$PARTITION"
-	    fi
-	    ;;
-	hdb*)
-	    local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep hdb)"
-	    if [ -z "$CDROM" ] ; then
-		echo "ultra1:$PARTITION"
-	    else
-		echo "cd:$PARTITION"
-	    fi
-	    ;;
 	hd*)
-	    local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
-	    if [ -z "$CDROM" ] ; then
-		echo 1>&2 "$PRG: Device: /dev/$DEVNODE is not supported"
-		return 1
-	    else
-		echo "cd:$PARTITION"
-	    fi
+	    ide_ofpath || return 1
 	    ;;
 	*)
 	    echo 1>&2 "$PRG: Device: /dev/$DEVNODE is not supported"