From owner-svn-src-all@FreeBSD.ORG  Thu Feb 25 15:29:41 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABF29106567B;
	Thu, 25 Feb 2010 15:29:41 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B2F28FC1D;
	Thu, 25 Feb 2010 15:29:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PFTfqM051964;
	Thu, 25 Feb 2010 15:29:41 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1PFTfUJ051963;
	Thu, 25 Feb 2010 15:29:41 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201002251529.o1PFTfUJ051963@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Thu, 25 Feb 2010 15:29:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204317 - head/sys/boot/uboot/lib
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 15:29:41 -0000

Author: raj
Date: Thu Feb 25 15:29:41 2010
New Revision: 204317
URL: http://svn.freebsd.org/changeset/base/204317

Log:
  Fix handling of GPT disk partition index.
  
  Obtained from:	Semihalf
  MFC after:	1 week

Modified:
  head/sys/boot/uboot/lib/disk.c

Modified: head/sys/boot/uboot/lib/disk.c
==============================================================================
--- head/sys/boot/uboot/lib/disk.c	Thu Feb 25 15:27:13 2010	(r204316)
+++ head/sys/boot/uboot/lib/disk.c	Thu Feb 25 15:29:41 2010	(r204317)
@@ -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)