Fix ofpath on early iMacs

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 0f944e2ef7f7ee52d179462dce69f9d3a80bbbb6..387bf900659cd9570d271f5eeff84285223fe904 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -3,7 +3,7 @@
 ###############################################################################
 ##
 ## ofpath: determine OpenFirmware path from unix device node
 ###############################################################################
 ##
 ## 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:
 ##
 ##
 ## 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##*/}"
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"

-VERSION=1.0.3-rc1
+VERSION=1.0.4

 DEBUG=0
 export LC_COLLATE=C
 
 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
 
 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."
 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()
     {
 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
         if [ -n "$SYMTARGET" ] ; then
             echo "$SYMTARGET"
             return 0


@@ -313,6 +313,7 @@ ide_ofpath()
            "PowerMac3,6")
                local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
                if [ -z "$CDROM" ] ; then
            "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"
                    echo "ultra2:$PARTITION"
                else
                    echo "cd:$PARTITION"


@@ -339,16 +340,23 @@ ide_ofpath()
            return 1
        fi
 
            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
        case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in

-           ata)
-               local CHANNEL=""
+           ide|ata)
+               local MASTER="/disk@0"
+               local SLAVE="/disk@1"

                ;;
                ;;

-           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)"
+           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)\""
                ;;
            *)
                echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""


@@ -357,12 +365,12 @@ ide_ofpath()
        esac
 
        case "$DEVNODE" in
        esac
 
        case "$DEVNODE" in

-           hda|hdc|hde|hdg|hdi)
-               echo "${DEVSPEC}${CHANNEL}/disk@0:$PARTITION"
+           hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
+               echo "${DEVSPEC}${MASTER}:$PARTITION"

                return 0
                ;;
                return 0
                ;;

-           hdb|hdd|hdf|hdh|hdj)
-               echo "${DEVSPEC}${CHANNEL}/disk@1:$PARTITION"
+           hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp)
+               echo "${DEVSPEC}${SLAVE}:$PARTITION"

                return 0
                ;;
            *)
                return 0
                ;;
            *)