Fix ofpath for G5 with multiple drives

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 1a69a486608eef3d54fd99bd9aab887f1ad68235..db9957c72b41c8df563b3a4d189fa6a584ab72fc 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -298,10 +298,10 @@ 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"
            ;;
        *)
            echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"
@@ -425,14 +425,6 @@ 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