From owner-svn-src-user@FreeBSD.ORG  Thu Jun 28 05:48:58 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7FFC106564A;
	Thu, 28 Jun 2012 05:48:58 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C330D8FC12;
	Thu, 28 Jun 2012 05:48:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5S5mwp2055324;
	Thu, 28 Jun 2012 05:48:58 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5S5mwxZ055322;
	Thu, 28 Jun 2012 05:48:58 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201206280548.q5S5mwxZ055322@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 28 Jun 2012 05:48:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237685 - user/ae/bootcode/sys/boot/i386/pmbr
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jun 2012 05:48:58 -0000

Author: ae
Date: Thu Jun 28 05:48:58 2012
New Revision: 237685
URL: http://svn.freebsd.org/changeset/base/237685

Log:
  Revert r237294.
  
  Requested by:	jhb

Modified:
  user/ae/bootcode/sys/boot/i386/pmbr/pmbr.s

Modified: user/ae/bootcode/sys/boot/i386/pmbr/pmbr.s
==============================================================================
--- user/ae/bootcode/sys/boot/i386/pmbr/pmbr.s	Thu Jun 28 05:42:04 2012	(r237684)
+++ user/ae/bootcode/sys/boot/i386/pmbr/pmbr.s	Thu Jun 28 05:48:58 2012	(r237685)
@@ -255,16 +255,6 @@ boot_uuid:	.long 0x83bd6b9d
 		.org DISKSIG,0x90
 sig:		.long 0				# OS Disk Signature
 		.word 0				# "Unknown" in PMBR
-						# Partition table
-partbl: 	.byte 0x80			# bootable flag
-		.byte 0x00			# CHS address 
-		.byte 0x02			#  of first 
-		.byte 0x00			#   sector
-		.byte 0xee			# Partition type PMBR
-		.byte 0xff			# CHS address
-		.byte 0xff			#  of last
-		.byte 0xff			#   sector
-		.long 1				# LBA of first sector
-		.long 0xffffffff		# LBA of last sector
-		.fill 0x10,0x3,0x0		# Remaining partition records
+
+partbl: 	.fill 0x10,0x4,0x0		# Partition table
 		.word MAGIC			# Magic number