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

[Andrey V. Elsukov]

Author: ae
Date: Mon Oct 22 11:01:43 2012
New Revision: 241876
URL: http://svn.freebsd.org/changeset/base/241876

Log:
  When loader tries to open GPT partition, but partition table is not GPT,
  then try automatically detect an appropriate partition type.
  
  PR:		kern/172550
  Tested by:	Ralf Wenk

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

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Mon Oct 22 10:53:59 2012	(r241875)
+++ head/sys/boot/common/disk.c	Mon Oct 22 11:01:43 2012	(r241876)
@@ -310,6 +310,13 @@ opened:
 		if (ptable_gettype(od->table) == PTABLE_GPT) {
 			partition = 255;
 			goto out; /* Nothing more to do */
+		} else if (partition == 255) {
+			/*
+			 * When we try to open GPT partition, but partition
+			 * table isn't GPT, reset d_partition value to -1
+			 * and try to autodetect appropriate value.
+			 */
+			partition = -1;
 		}
 		/*
 		 * If d_partition < 0 and we are looking at a BSD slice,