[Debootloaders-devel] r51 - in trunk/yaboot: debian ybin

[Aurélien GÉRÔME]

Author: ag-guest
Date: 2006-07-10 22:54:49 +0000 (Mon, 10 Jul 2006)
New Revision: 51

Modified:
   trunk/yaboot/debian/changelog
   trunk/yaboot/ybin/ofpath
Log:
Add Paul Nasrat's patch to boot G5 second SATA harddisk.


Modified: trunk/yaboot/debian/changelog
===================================================================
--- trunk/yaboot/debian/changelog	2006-07-10 22:43:45 UTC (rev 50)
+++ trunk/yaboot/debian/changelog	2006-07-10 22:54:49 UTC (rev 51)
@@ -6,8 +6,9 @@
   suppress override disparities shown by the PTS.
   * Fix yaboot booting with initramfs from XFS (closes: #336993).
   * Fix to recognise RAID filesystems (closes: #233810).
+  * Fix to boot Apple G5 second SATA harddisk (closes: #294081).
 
- -- Aurélien GÉRÔME <ag at roxor.cx>  Tue, 11 Jul 2006 00:40:02 +0200
+ -- Aurélien GÉRÔME <ag at roxor.cx>  Tue, 11 Jul 2006 00:50:44 +0200
 
 yaboot (1.3.13-6) unstable; urgency=low
 

Modified: trunk/yaboot/ybin/ofpath
===================================================================
--- trunk/yaboot/ybin/ofpath	2006-07-10 22:43:45 UTC (rev 50)
+++ trunk/yaboot/ybin/ofpath	2006-07-10 22:54:49 UTC (rev 51)
@@ -298,10 +298,10 @@
 	    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 at 0:$PARTITION"
+	    echo "${DEVICE_PATH##*device-tree}/disk at 0:$PARTITION"
 	    ;;
 	*)
 	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"