From 341c4563e3bdd3e84ba726ff0a71ab55963f2c72 Mon Sep 17 00:00:00 2001
From: dsl <dsl@NetBSD.org>
Date: Thu, 15 May 2003 08:50:53 +0000
Subject: [PATCH] Incorrect sector number passed to boot1 in floppy (no mbr)
 case

---
 sys/arch/i386/stand/bootxx/pbr.S | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys/arch/i386/stand/bootxx/pbr.S b/sys/arch/i386/stand/bootxx/pbr.S
index e54f9861c98c..0d8dce529230 100644
--- a/sys/arch/i386/stand/bootxx/pbr.S
+++ b/sys/arch/i386/stand/bootxx/pbr.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: pbr.S,v 1.2 2003/04/24 17:37:54 dsl Exp $	*/
+/*	$NetBSD: pbr.S,v 1.3 2003/05/15 08:50:53 dsl Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -134,6 +134,7 @@ start0:
 
 /* See if this is our code, if so we have already loaded the next stage */
 
+	xorl	%ebp, %ebp		/* pass sector 0 to next stage */
 	movl	(%bx), %eax		/* mbr code shouldn't even have ... */
 	cmpl	R(start), %eax		/* ... a jmp at the start. */
 	je	pbr_read_ok
@@ -350,8 +351,10 @@ _newline:
 #ifndef TERSE_ERROR
 ERR_READ:	.asciz	"Disk read error"
 ERR_NO_BOOTXX:	.asciz	"Not a bootxx image"
-ERR_NO_LBA:	.asciz	"Invalid CHS read"
 ERR_PTN:	.asciz	"No NetBSD partition"
+#ifndef NO_LBA_CHECK
+ERR_NO_LBA:	.asciz	"Invalid CHS read"
+#endif
 #endif
 
 /*