svn commit: r204729 - stable/8/sys/boot/uboot/lib

[Rafal Jaworowski]

Author: raj
Date: Thu Mar  4 20:12:12 2010
New Revision: 204729
URL: http://svn.freebsd.org/changeset/base/204729

Log:
  MFC r204317
  
  Fix handling of GPT disk partition index.
  
  Obtained from:	Semihalf

Modified:
  stable/8/sys/boot/uboot/lib/disk.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/boot/uboot/lib/disk.c
==============================================================================
--- stable/8/sys/boot/uboot/lib/disk.c	Thu Mar  4 20:07:59 2010	(r204728)
+++ stable/8/sys/boot/uboot/lib/disk.c	Thu Mar  4 20:12:12 2010	(r204729)
@@ -376,6 +376,14 @@ stor_open_gpt(struct open_dev *od, struc
 	}
 
 	dev->d_disk.ptype = PTYPE_GPT;
+	/*
+	 * If index of partition to open (dev->d_disk.pnum) is not defined
+	 * we set it to the index of the first existing partition. This
+	 * handles cases when only a disk device is specified (without full
+	 * partition information) by the caller.
+	 */
+	if ((od->od_nparts > 0) && (dev->d_disk.pnum == 0))
+		dev->d_disk.pnum = od->od_partitions[0].gp_index;
 
 	for (i = 0; i < od->od_nparts; i++)
 		if (od->od_partitions[i].gp_index == dev->d_disk.pnum)