From owner-svn-src-head@FreeBSD.ORG  Mon Sep 28 23:52:47 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E74B106566B;
	Mon, 28 Sep 2009 23:52:47 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E09F8FC08;
	Mon, 28 Sep 2009 23:52:47 +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 n8SNqla0069972;
	Mon, 28 Sep 2009 23:52:47 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8SNql1n069970;
	Mon, 28 Sep 2009 23:52:47 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200909282352.n8SNql1n069970@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 28 Sep 2009 23:52:47 +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: r197608 - head/sys/geom/part
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Sep 2009 23:52:47 -0000

Author: marcel
Date: Mon Sep 28 23:52:47 2009
New Revision: 197608
URL: http://svn.freebsd.org/changeset/base/197608

Log:
  The first 96 bytes may not be zeroes. It can contain trivial boot
  code that merely emits an error and waits for a key press before
  rebooting. The error being that extended partitions are not
  bootable. The origin is presumed to be Windows 2000; Windows XP
  does not do this...
  
  For now, ignore the first 96 bytes when checking that the EBR is
  (for the most part) all zeroes.
  
  Tested by:	Mario Lobo <mlobo@digiart.art.br>
  MFC after:	1 week

Modified:
  head/sys/geom/part/g_part_ebr.c

Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c	Mon Sep 28 23:48:16 2009	(r197607)
+++ head/sys/geom/part/g_part_ebr.c	Mon Sep 28 23:52:47 2009	(r197608)
@@ -410,13 +410,13 @@ g_part_ebr_probe(struct g_part_table *ta
 		goto out;
 
 	/*
-	 * The sector is all zeroes, except for the partition entries
-	 * and some signatures or disk serial number. Those can be
-	 * found in the 9 bytes immediately in front of the partition
-	 * table.
+	 * The sector is all zeroes, except for the partition entries,
+	 * pseudo boot code and some signatures or disk serial number.
+	 * The latter can be found in the 9 bytes immediately in front
+	 * of the partition table.
 	 */
 	sum = 0;
-	for (index = 0; index < DOSPARTOFF - 9; index++)
+	for (index = 96; index < DOSPARTOFF - 9; index++)
 		sum += buf[index];
 	if (sum != 0)
 		goto out;