Merge ubuntu ofpath fixes

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index d596b8b226eb14c4ed7ea997203ce7ea67b77911..3724eb19a2b041200db003bccb721d7bc57f979c 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -8,7 +8,7 @@
 ## Portions based on show_of_path.sh:
 ##
 ## Copyright (C) 2000 Olaf Hering <olh@suse.de>
-## 
+##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
 ## as published by the Free Software Foundation; either version 2
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.6
+VERSION=1.0.7
 DEBUG=0
 export LC_COLLATE=C
 
@@ -116,11 +116,11 @@ linecount()
 ## small tr replacment which handles a specific need of this script.
 smalltr()
 {
-    case "$1" in 
+    case "$1" in
        a) echo 1 ;; b) echo 2 ;; c) echo 3 ;; d) echo 4 ;; e) echo 5 ;; f) echo 6 ;;
        g) echo 7 ;; h) echo 8 ;; i) echo 9 ;; j) echo 10 ;; k) echo 11 ;; l) echo 12 ;;
        m) echo 13 ;; n) echo 14 ;; o) echo 15 ;; p) echo 16 ;;
-       1) echo a ;; 2) echo b ;; 3) echo c ;; 4) echo d ;; 5) echo e ;; 
+       1) echo a ;; 2) echo b ;; 3) echo c ;; 4) echo d ;; 5) echo e ;;
        6) echo f ;; 7) echo g ;; 8) echo h ;; 9) echo i ;; 10) echo j ;;
        11) echo k ;; 12) echo l ;; 13) echo m ;; 14) echo n ;; 15) echo o ;;
        16) echo p ;;
@@ -298,10 +298,16 @@ scsi_ofpath()
            echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
            ;;
        ata_k2|sata_svw)
-           HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
-                       lgrep "$i" "k2-s-ata" ; done)"
+           HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do
+                       lgrep "$i" "k2-sata" ; done | sort)"
            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
-           echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk@0:$PARTITION"
+           echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION"
+           ;;
+        sbp2)
+            HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do
+                        lgrep "$i" "sbp-2" ; done)"
+            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+            echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION"
            ;;
        *)
            echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
@@ -396,6 +402,10 @@ ide_ofpath()
                local MASTER="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0))"
                local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
                ;;
+           spi)
+               local MASTER="/disk@$(cat /proc/ide/${IDEBUS}/channel),0"
+               local SLAVE="/disk@$(cat /proc/ide/${IDEBUS}/channel),1"
+               ;;
            *)
                echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
                return 1
@@ -425,19 +435,11 @@ newworld()
 {
     case "$DEVNODE" in
        sd*)
-           if ls -l /proc/device-tree | grep -q ^lr ; then
-               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 HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
-               return 1
-           fi
-
            ## use common scsiinfo function to get info we need.
            scsiinfo || return 1
 
            ## now we have the data for /@$DEVID:$PARTITION
-           ## find the actual OF path. 
+           ## find the actual OF path.
            scsi_ofpath || return 1
            ;;
        hd*)
@@ -667,7 +669,7 @@ chrp()
 {
     case "$DEVNODE" in
        sd*)
-           if ls -l /proc/device-tree | grep -q ^lr ; then
+           if ls -l /proc/device-tree | grep -q ^d ; then
                true
            else
                echo 1>&2 "$PRG: /proc/device-tree is broken."
@@ -678,7 +680,7 @@ chrp()
            scsiinfo || return 1
 
            ## now we have the data for /@$DEVID:$PARTITION
-           ## find the actual OF path. 
+           ## find the actual OF path.
            scsi_ofpath || return 1
            ;;
        *)
@@ -914,6 +916,8 @@ elif (cat /proc/cpuinfo 2>/dev/null | grep ^motherboard | grep -q AAPL) ; then
     SUBARCH=OldWorld
 elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
     SUBARCH=CHRP
+elif (cat /proc/cpuinfo 2>/dev/null | grep ^machine | grep -q 'CHRP Pegasos') ; then
+    SUBARCH=Pegasos
 else
     echo 1>&2 "$PRG: This machine is not yet supported"
     exit 1
@@ -936,7 +940,8 @@ PARTITION="${DEVICE##*[a-z]}"
 
 ## use appropriate search for right sub arch.
 case "$SUBARCH" in
-    NewWorld)
+    # Pegasos OF seems to be NewWorld-ish enough to cope with this.
+    NewWorld|Pegasos)
        newworld || exit 1
        ;;
     OldWorld)