rpms/yaboot/devel yaboot-1.3.13-ofpath-pegasos.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11332

Modified Files:
	yaboot-1.3.13-ofpath-pegasos.patch 
Log Message:
fix partition numbering for Pegasos

yaboot-1.3.13-ofpath-pegasos.patch:
 ofpath |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletion(-)

Index: yaboot-1.3.13-ofpath-pegasos.patch
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot-1.3.13-ofpath-pegasos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yaboot-1.3.13-ofpath-pegasos.patch	30 Jul 2005 13:35:30 -0000	1.1
+++ yaboot-1.3.13-ofpath-pegasos.patch	30 Jul 2005 22:37:25 -0000	1.2
@@ -1,5 +1,5 @@
---- yaboot-1.3.13/ybin/ofpath.orig	2005-07-30 13:51:22.000000000 +0100
-+++ yaboot-1.3.13/ybin/ofpath	2005-07-30 14:14:19.000000000 +0100
+--- yaboot-1.3.13/ybin/ofpath.ofpath	2005-07-30 23:28:00.000000000 +0100
++++ yaboot-1.3.13/ybin/ofpath	2005-07-30 23:34:52.000000000 +0100
 @@ -382,12 +382,19 @@ ide_ofpath()
  	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
  	    return 1
@@ -21,13 +21,17 @@
  	    pci-ide|pci-ata)
  		local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk at 0"
  		local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk at 1"
-@@ -681,6 +688,36 @@ chrp()
+@@ -681,6 +688,40 @@ chrp()
      return 0
  }
  
 +## find OpenFirmware device path for Genesi Pegasos hardware (ide only)
 +pegasos()
 +{
++    # SmartFirmware disagrees with the rest of the world about whether
++    # partition numbers should start at zero or one.
++    [ -n $PARTITION ] && PARTITION=$($PARTITION - 1))
++
 +    case "$DEVNODE" in
 +	sd*)
 +	    if ls -l /proc/device-tree | grep -q ^lr ; then
@@ -58,7 +62,7 @@
  ## If we get lame devfs name, we need to make it foad
  ckdevfs()
  {
-@@ -906,6 +943,8 @@ elif (cat /proc/cpuinfo 2>/dev/null | gr
+@@ -906,6 +947,8 @@ elif (cat /proc/cpuinfo 2>/dev/null | gr
      SUBARCH=OldWorld
  elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
      SUBARCH=CHRP
@@ -67,7 +71,7 @@
  else
      echo 1>&2 "$PRG: This machine is not yet supported"
      exit 1
-@@ -937,6 +976,9 @@ case "$SUBARCH" in
+@@ -937,6 +980,9 @@ case "$SUBARCH" in
      CHRP)
  	chrp || exit 1
  	;;