Module Name: src
Committed By: msaitoh
Date: Fri Jun 14 03:04:20 UTC 2013
Modified Files:
src/sys/sys [netbsd-5]: bootblock.h
src/usr.sbin/installboot/arch [netbsd-5]: vax.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1856):
sys/sys/bootblock.h rev. 1.55
usr.sbin/installboot/arch/vax.c rev. 1.16
Adapt to new vax primary bootstrap layout.
Don't include host's disklabel.h.
To generate a diff of this commit:
cvs rdiff -u -r1.45.10.1 -r1.45.10.2 src/sys/sys/bootblock.h
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/usr.sbin/installboot/arch/vax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/bootblock.h
diff -u src/sys/sys/bootblock.h:1.45.10.1 src/sys/sys/bootblock.h:1.45.10.2
--- src/sys/sys/bootblock.h:1.45.10.1 Wed Jun 12 06:05:52 2013
+++ src/sys/sys/bootblock.h Fri Jun 14 03:04:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bootblock.h,v 1.45.10.1 2013/06/12 06:05:52 msaitoh Exp $ */
+/* $NetBSD: bootblock.h,v 1.45.10.2 2013/06/14 03:04:20 msaitoh Exp $ */
/*-
* Copyright (c) 2002-2004 The NetBSD Foundation, Inc.
@@ -1380,7 +1380,7 @@ struct vax_boot_block {
uint8_t bb_mbone; /* must be one */
uint16_t bb_lbn_hi; /* lbn (hi word) of bootstrap */
uint16_t bb_lbn_low; /* lbn (low word) of bootstrap */
- uint8_t pad1[460];
+ uint8_t pad1[406];
/* disklabel offset is 64 from base, or 56 from start of pad1 */
/* The rest of these fields are identification area and describe
@@ -1403,7 +1403,7 @@ struct vax_boot_block {
/* The rest is unused.
*/
- uint8_t pad2[20];
+ uint8_t pad2[74];
} __packed;
#define VAX_BOOT_MAGIC1 0x18 /* size of BB info? */
Index: src/usr.sbin/installboot/arch/vax.c
diff -u src/usr.sbin/installboot/arch/vax.c:1.12.6.1 src/usr.sbin/installboot/arch/vax.c:1.12.6.2
--- src/usr.sbin/installboot/arch/vax.c:1.12.6.1 Wed Jun 12 06:05:52 2013
+++ src/usr.sbin/installboot/arch/vax.c Fri Jun 14 03:04:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vax.c,v 1.12.6.1 2013/06/12 06:05:52 msaitoh Exp $ */
+/* $NetBSD: vax.c,v 1.12.6.2 2013/06/14 03:04:20 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -68,11 +68,17 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: vax.c,v 1.12.6.1 2013/06/12 06:05:52 msaitoh Exp $");
+__RCSID("$NetBSD: vax.c,v 1.12.6.2 2013/06/14 03:04:20 msaitoh Exp $");
#endif /* !__lint */
-#include <sys/param.h>
+/* We need the target disklabel.h, not the hosts one..... */
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/vax/disklabel.h>
+#include <nbinclude/sys/disklabel.h>
+#else
#include <sys/disklabel.h>
+#endif
+#include <sys/param.h>
#include <assert.h>
#include <err.h>
