Date: Thu, 25 Feb 2010 15:29:41 +0000 (UTC) From: Rafal Jaworowski <raj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r204317 - head/sys/boot/uboot/lib Message-ID: <201002251529.o1PFTfUJ051963@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002251529.o1PFTfUJ051963>