From: Paul Nasrat <pnasrat@redhat.com>
Date: Tue, 11 Jul 2006 20:18:09 +0000 (-0400)
Subject: Fix for not all device trees having k2-sata@N/compatible (from gentoo)
X-Git-Tag: yaboot-1.3.14rc2~25
X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=75c4ba10686ac9d3a392cdcd537489eaf656951e;ds=sidebyside

Fix for not all device trees having k2-sata@N/compatible (from gentoo)
---

diff --git a/ybin/ofpath b/ybin/ofpath
index 3724eb1..9cddc91 100755
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -298,10 +298,18 @@ 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)
             HOST_LIST="$(for i in `find /proc/device-tree -name name` ; do