 @@ -1,14 +1,14 @@
-.\"	$NetBSD: installboot.8,v 1.84 2012/02/11 07:27:25 ast Exp $
+.\"	$NetBSD: installboot.8,v 1.85 2012/03/10 18:42:18 dsl Exp $
 .\"
 .\" Copyright (c) 2002-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Luke Mewburn of Wasabi Systems.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -17,27 +17,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 .\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 11, 2012
+.Dd March 10, 2012
 .Dt INSTALLBOOT 8
 .Os
 .Sh NAME
 .Nm installboot
 .Nd install disk bootstrap software
+.
 .Sh SYNOPSIS
 .Nm
 .Op Fl fnv
 .Op Fl B Ar s2bno
 .Op Fl b Ar s1bno
 .Op Fl m Ar machine
 .Op Fl o Ar options
 @@ -155,26 +155,27 @@ If this option is supplied,
 .Ar secondary
 should refer to an actual secondary bootstrap (rather than the
 file name of the one present in
 .Ar filesystem )
 so that its size can be determined.
+.
 .It Fl b Ar s1bno
 Install
 .Ar primary
 at block number
 .Ar s1bno
 instead of the default location for the machine and file system type.
 .Sy [ alpha ,
 .Sy i386/amd64 (bootxx_fat16 only) ,
 .Sy pmax ,
 .Sy vax ]
+.
 .It Fl c
 Clear (remove) any existing bootstrap instead of installing one.
+.
 .It Fl e
 Edit the options of an existing bootstrap.
 This can be use to change the options in bootxx_xxxfs files,
 raw disk partitions, and the
 .Pa pxeboot_ia32.bin
 file.
 With
 @@ -443,26 +444,32 @@ Installed into the bootstrap area of the
 .It Pa /usr/mdec/bootxx_fat16
 Primary bootstrap for
 .Tn MS-DOS
 .Sy FAT16
 file systems.
 This differs from
 .Nm bootxx_msdos
 in that it doesn't require the filesystem to have been initialised with
 any
 .Ql reserved sectors .
 It also uses the information in the
 .Ql Boot Parameter Block
 to get the media and filesytem properties.
 The
 .Ql hidden sectors
 field of the BPB must the offset of the partition in the disk.
 This can be set using the
 .Fl b Ar s1bno
 option.
+.
 .It Pa /usr/mdec/bootxx_ffsv1
 Primary bootstrap for
 .Sy FFSv1
 file systems
 (the
 .Ql traditional
 file system prior to
 .Nx 6.0 ) .
 Use
 .Xr dumpfs 8
 to confirm the file system format is
 .Sy FFSv1 .

 @@ -1,14 +1,14 @@
-/* $NetBSD: i386.c,v 1.37 2011/08/14 17:50:17 christos Exp $ */
+/* $NetBSD: i386.c,v 1.38 2012/03/10 18:42:18 dsl Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David Laight.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: i386.c,v 1.37 2011/08/14 17:50:17 christos Exp $");
+__RCSID("$NetBSD: i386.c,v 1.38 2012/03/10 18:42:18 dsl Exp $");
 #endif /* !__lint */
 #include <sys/param.h>
 #ifndef HAVE_NBTOOL_CONFIG_H
 #include <sys/ioctl.h>
 #include <sys/dkio.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <err.h>
 #include <md5.h>
 #include <stddef.h>
 @@ -69,33 +69,35 @@ static const struct console_name {
 	{ "com1kbd",	6 /* CONSDEV_COM1KBD */ },
 	{ "com2kbd",	7 /* CONSDEV_COM2KBD */ },
 	{ "com3kbd",	8 /* CONSDEV_COM3KBD */ },
 	{ "auto",	-1 /* CONSDEV_AUTO */ },
 };
 static int i386_setboot(ib_params *);
 static int i386_editboot(ib_params *);
 struct ib_mach ib_mach_i386 =
 	{ "i386", i386_setboot, no_clearboot, i386_editboot,
 		IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED | IB_CONSADDR |
 		IB_KEYMAP | IB_PASSWORD | IB_TIMEOUT |
-		IB_MODULES | IB_BOOTCONF };
+		IB_MODULES | IB_BOOTCONF |
 		IB_STAGE1START };
 struct ib_mach ib_mach_amd64 =
 	{ "amd64", i386_setboot, no_clearboot, i386_editboot,
 		IB_RESETVIDEO | IB_CONSOLE | IB_CONSPEED | IB_CONSADDR |
 		IB_KEYMAP | IB_PASSWORD | IB_TIMEOUT |
-		IB_MODULES | IB_BOOTCONF };
+		IB_MODULES | IB_BOOTCONF |
 		IB_STAGE1START };
 /*
  * Attempting to write the 'labelsector' (or a sector near it - within 8k?)
  * using the non-raw disk device fails silently.  This can be detected (today)
  * by doing a fsync() and a read back.
  * This is very likely to affect installboot, indeed the code may need to
  * be written into the 'labelsector' itself - especially on non-512 byte media.
  * We do all writes with a read verify.
  * If EROFS is returned we also try to enable writes to the label sector.
  * (Maybe these functions should be in the generic part of installboot.)
  */
 static int
 pwrite_validate(int fd, const void *buf, size_t n_bytes, off_t offset)
 @@ -430,26 +432,29 @@ i386_setboot(ib_params *params)
 			/* Check we have enough space for the old bpb */
 			if (disk_buf.b[1] > bootstrap.b[1]) {
 				/* old BPB is larger, allow if extra zeros */
 				if (!is_zero(disk_buf.b + 2 + bootstrap.b[1],
 				    disk_buf.b[1] - bootstrap.b[1])) {
 					warnx("Old BPB too big" USE_F);
 					    return 0;
+				}
 				u = bootstrap.b[1];
 			} else {
 				/* Old BPB is shorter, leave zero filled */
 				u = disk_buf.b[1];
+			}
 			if (params->s1start != 0)
 				/* Fixup physical offset of filesytem */
 				bpb->bpbHiddenSecs = htole32(params->s1start);
 			memcpy(bootstrap.b + 2, disk_buf.b + 2, u);
+		}
 		#undef USE_F
+	}
 	/*
 	 * Fill in any user-specified options into the
 	 *      struct x86_boot_params
 	 * that follows the magic number.
 	 * See sys/arch/i386/stand/bootxx/bootxx.S for more information.
 	 */
 	if (update_i386_boot_params(params, (void *)(magic + 1)))
 		return 0;