Fix botched IBM patch (multiple partition handling on rs6k)

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index be3f8cd4d8f55f2281acb9f56ffc802feb799cd1..46bd7345bd1989c34fd70f8563485c7982a36b13 100755 (executable)
--- 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-DEVEL_DO_NOT_DISTRIBUTE-patch-36
+VERSION=1.0.3
 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
@@ -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
@@ -309,16 +313,13 @@ 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"
                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 +333,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-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"
+               ;;
+           *)
+               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"
+           hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
+               echo "${DEVSPEC}${MASTER}:$PARTITION"
                return 0
                ;;
-           hdb|hdd|hdf|hdh|hdj)
-               echo "${DEVSPEC}/disk@1:$PARTITION"
+           hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp)
+               echo "${DEVSPEC}${SLAVE}:$PARTITION"
                return 0
                ;;
            *)