From 6cf3949d0a06ae0c5500e7062bb8e40f82a0c377 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 9 Jul 2010 17:36:39 +0000 Subject: un-terminated string found when comparing to i386 boot code. These should be 100% identical. ok toby --- sys/arch/amd64/stand/biosboot/biosboot.8 | 7 +++---- sys/arch/amd64/stand/biosboot/biosboot.S | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/arch/amd64/stand/biosboot/biosboot.8 b/sys/arch/amd64/stand/biosboot/biosboot.8 index 1f0db5136c3..5ae7055e685 100644 --- a/sys/arch/amd64/stand/biosboot/biosboot.8 +++ b/sys/arch/amd64/stand/biosboot/biosboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: biosboot.8,v 1.7 2007/05/31 19:20:02 jmc Exp $ +.\" $OpenBSD: biosboot.8,v 1.8 2010/07/09 17:36:38 deraadt Exp $ .\" .\" Copyright (c) 2003 Tom Cosgrove .\" Copyright (c) 1997 Michael Shalayeff @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: July 9 2010 $ .Dt BIOSBOOT 8 amd64 .Os .Sh NAME @@ -258,8 +258,7 @@ kernel for installation/recovery .Sh HISTORY .Nm was originally written by Michael Shalayeff for -.Ox 2.1 -on the i386 platform. +.Ox 2.1 . However it was based on bootstrap code from older versions of this operating system, other operating systems, other programs, and other people's work. diff --git a/sys/arch/amd64/stand/biosboot/biosboot.S b/sys/arch/amd64/stand/biosboot/biosboot.S index b77ee1edff2..e3dcbd147f4 100644 --- a/sys/arch/amd64/stand/biosboot/biosboot.S +++ b/sys/arch/amd64/stand/biosboot/biosboot.S @@ -1,4 +1,4 @@ -/* $OpenBSD: biosboot.S,v 1.5 2009/09/30 19:03:17 weingart Exp $ */ +/* $OpenBSD: biosboot.S,v 1.6 2010/07/09 17:36:38 deraadt Exp $ */ /* * Copyright (c) 2003 Tobias Weingartner @@ -190,7 +190,7 @@ ebpb: .long 16 /* hidden sectors */ .word 0 /* physical disk */ .byte 0x29 /* signature, needed by NT */ .space 4, 0 /* volume serial number */ - .ascii "UNIX LABEL" + .asciz "UNIX LABEL" .asciz "UFS 4.4" /* boot code */ -- cgit v1.2.3