Module Name: src
Committed By: ast
Date: Thu Feb 9 18:35:44 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/amd64: md.h
src/usr.sbin/installboot: installboot.8
Log Message:
Update the amd64 and i386 examples to use /usr/mdec/bootxx_ffsv2,
i.e. DEFAULT_UFS2 as src/distrib/utils/sysinst/bsddisklabel.c does
since post-NetBSD5. This avoids rendering an i386 or amd64 system
unbootable if the given example is thoughtlessly cut-and-pasted on
a NetBSD6.x system (been there, done that ;-) Qualify the descriptions
of /usr/mdec/bootxx_ffsv{1,2} along those lines.
Fixed a small typo in comment of distrib/utils/sysinst/arch/amd64/md.h.
Ok by releng@
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.81 -r1.82 src/usr.sbin/installboot/installboot.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/amd64/md.h
diff -u src/distrib/utils/sysinst/arch/amd64/md.h:1.27 src/distrib/utils/sysinst/arch/amd64/md.h:1.28
--- src/distrib/utils/sysinst/arch/amd64/md.h:1.27 Mon Apr 4 08:30:17 2011
+++ src/distrib/utils/sysinst/arch/amd64/md.h Thu Feb 9 18:35:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.27 2011/04/04 08:30:17 mbalmer Exp $ */
+/* $NetBSD: md.h,v 1.28 2012/02/09 18:35:44 ast Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -55,7 +55,7 @@
/* use UFS2 by default for ffs */
#define DEFAULT_UFS2
-/* have support for booting form UFS2 */
+/* have support for booting from UFS2 */
#define HAVE_UFS2_BOOT
/* allow using tmpfs for /tmp instead of mfs */
Index: src/usr.sbin/installboot/installboot.8
diff -u src/usr.sbin/installboot/installboot.8:1.81 src/usr.sbin/installboot/installboot.8:1.82
--- src/usr.sbin/installboot/installboot.8:1.81 Mon Jan 9 19:40:09 2012
+++ src/usr.sbin/installboot/installboot.8 Thu Feb 9 18:35:44 2012
@@ -1,6 +1,6 @@
-.\" $NetBSD: installboot.8,v 1.81 2012/01/09 19:40:09 skrll Exp $
+.\" $NetBSD: installboot.8,v 1.82 2012/02/09 18:35:44 ast Exp $
.\"
-.\" Copyright (c) 2002-2009 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2002-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 9, 2012
+.Dd February 9, 2012
.Dt INSTALLBOOT 8
.Os
.Sh NAME
@@ -458,9 +458,12 @@ to get the media and filesytem propertie
Primary bootstrap for
.Sy FFSv1
file systems
-(the "traditional"
+(the
+.Ql traditional
.Nx
-file system).
+file system prior to
+.Nx
+6).
Use
.Xr dumpfs 8
to confirm the file system format is
@@ -469,7 +472,9 @@ to confirm the file system format is
.It Pa /usr/mdec/bootxx_ffsv2
Primary bootstrap for
.Sy FFSv2
-file systems.
+file systems (the default file system for some platforms as of
+.Nx
+6).
Use
.Xr dumpfs 8
to confirm the file system format is
@@ -623,12 +628,14 @@ already present in the SysVBFS partition
.Dl Ic installboot /dev/rsd0c /usr/mdec/bootxx_bfs
.
.Ss Nx Ns Tn /i386 and Nx Ns Tn /amd64
-Install new boot blocks on an existing mounted root file system on
+Install new boot blocks on an existing
+.Sy FFSv2
+mounted root file system on
.Sq wd0 ,
setting the timeout to five seconds, after copying a new secondary
bootstrap:
.Dl Ic cp /usr/mdec/boot /boot
-.Dl Ic installboot -v -o timeout=5 /dev/rwd0a /usr/mdec/bootxx_ffsv1
+.Dl Ic installboot -v -o timeout=5 /dev/rwd0a /usr/mdec/bootxx_ffsv2
.
.Pp
Create a bootable CD-ROM with an ISO 9660
