svn commit: r239232 - head/sys/boot/common

[Andrey V. Elsukov]

Author: ae
Date: Mon Aug 13 13:33:21 2012
New Revision: 239232
URL: http://svn.freebsd.org/changeset/base/239232

Log:
  Restore the old behaviour. If requested partition is a BSD slice,
  but d_partition isn't explicitly set, then try to open BSD label and its
  first partition.

Modified:
  head/sys/boot/common/disk.c

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Mon Aug 13 13:10:50 2012	(r239231)
+++ head/sys/boot/common/disk.c	Mon Aug 13 13:33:21 2012	(r239232)
@@ -185,10 +185,18 @@ disk_open(struct disk_devdesc *dev, off_
 		if (rc != 0) /* Partition doesn't exist */
 			goto out;
 		dev->d_offset = part.start;
-		if (dev->d_partition == -1 ||
-		    dev->d_partition == 255)
+		if (dev->d_partition == 255)
 			goto out; /* Nothing more to do */
-
+		if (dev->d_partition == -1) {
+			/*
+			 * If we are looking at a BSD slice, and the
+			 * partition is < 0, assume the 'a' partition.
+			 */
+			if (part.type == PART_FREEBSD)
+				dev->d_partition = 0;
+			else
+				goto out;
+		}
 		/* Try to read BSD label */
 		table = ptable_open(dev, part.end - part.start + 1,
 		    od->sectorsize, ptblread);