ybin --bootonce doesn't work

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 3724eb19a2b041200db003bccb721d7bc57f979c..aff5583457e645f878c01e1084e59689cee94b88 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -250,7 +250,7 @@ scsiinfo()
        DEVHOST="$(v=$(echo ${DEVINFO##*Host: scsi}) ; echo ${v%% *})"
        [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVHOST=$DEVHOST"
 
-       if [ "$DEVTYPE" = "Direct-Access" ] ; then
+       if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
            DEVCOUNT="$(($DEVCOUNT + 1))"
            [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVCOUNT=$DEVCOUNT"
            if [ "$SUBDEV" = "$DEVCOUNT" ] ; then
@@ -298,14 +298,32 @@ scsi_ofpath()
            echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
            ;;
        ata_k2|sata_svw)
+            #Not all G5 device trees have a compatible "k2-sata" node 
+            #per channel use parent
            HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do
-                       lgrep "$i" "k2-sata" ; done | sort)"
+                       lgrep "$i" "k2-s-ata" ; done | sort)"
            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
-           echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION"
+           K2_DEVICE_ID=0
+           while [ "$DEVICE_PATH" = "" ] ; do
+               SCSI_HOSTNUMBER=`expr $SCSI_HOSTNUMBER - 1`
+               let "K2_DEVICE_ID += 1"
+               DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+           done
+           echo "${DEVICE_PATH##*device-tree}/k2-sata@$K2_DEVICE_ID/disk@0:$PARTITION"
            ;;
-        sbp2)
+       usb-storage)
+            HOST_LIST="$(for i in `find /proc/device-tree -name name | grep usb` ; do
+                        lgrep "$i" "disk" ; done)"
+            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
+            echo "${DEVICE_PATH##*device-tree}:$PARTITION"
+           ;;
+       sbp2|"")
+            # sbp-2 driver may not have a dir in /proc/scsi
             HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do
                         lgrep "$i" "sbp-2" ; done)"
+            if [ "$SCSI_HOSTNUMBER" = "" ] ; then
+                SCSI_HOSTNUMBER=1
+            fi
             DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
             echo "${DEVICE_PATH##*device-tree}/disk@0:$PARTITION"
            ;;
@@ -669,12 +687,6 @@ chrp()
 {
     case "$DEVNODE" in
        sd*)
-           if ls -l /proc/device-tree | grep -q ^d ; then
-               true
-           else
-               echo 1>&2 "$PRG: /proc/device-tree is broken."
-               return 1
-           fi
 
            ## use common scsiinfo function to get info we need.
            scsiinfo || return 1
@@ -776,7 +788,7 @@ fixdevfs()
            local DEVTYPE="$(v=$(echo ${DEVINFO##*Type: }) ; echo ${v%% *})"
            [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: fixdevfs: DEVTYPE=$DEVTYPE"
 
-           if [ "$DEVTYPE" = "Direct-Access" ] ; then
+           if [ "$DEVTYPE" = "Direct-Access" ] || [ "$DEVTYPE" = "Direct-Access-RBC" ] ; then
                ## Lets find out some more information
                ## get the device id.
                local DEVID="$(v=$(echo ${DEVINFO##*Id: }) ; n=$(echo ${v%% *}) ; echo ${n#*0})"