Module Name: src
Committed By: snj
Date: Sat Apr 25 10:34:43 UTC 2009
Modified Files:
src/distrib/notes/alpha: hardware install
src/distrib/notes/common: contents main sysinst xfer
Log Message:
Yet another round of INSTALL fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/notes/alpha/hardware
cvs rdiff -u -r1.35 -r1.36 src/distrib/notes/alpha/install
cvs rdiff -u -r1.153 -r1.154 src/distrib/notes/common/contents
cvs rdiff -u -r1.444 -r1.445 src/distrib/notes/common/main
cvs rdiff -u -r1.97 -r1.98 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.64 -r1.65 src/distrib/notes/common/xfer
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/alpha/hardware
diff -u src/distrib/notes/alpha/hardware:1.15 src/distrib/notes/alpha/hardware:1.16
--- src/distrib/notes/alpha/hardware:1.15 Sat Sep 6 21:36:40 2008
+++ src/distrib/notes/alpha/hardware Sat Apr 25 10:34:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: hardware,v 1.15 2008/09/06 21:36:40 tsutsui Exp $
+.\" $NetBSD: hardware,v 1.16 2009/04/25 10:34:42 snj Exp $
.
.Nx*M
\*V runs on most of the
@@ -166,7 +166,7 @@
.It
ISA multi-port 16x50 boards
.Em ( ast , boca ;
-Only the latter has been tested )
+Only the latter has been tested)
.bullet)
.bullet)
.
@@ -207,7 +207,7 @@
.Nx*M
since there is no keyboard or mouse support available for the
TurboChannel systems, they aren't very useful.
-XXX: is this still true now that the MI sfb.c is used???
+.\" XXX: is this still true now that the MI sfb.c is used???
.Note)
.It
Network Cards
Index: src/distrib/notes/alpha/install
diff -u src/distrib/notes/alpha/install:1.35 src/distrib/notes/alpha/install:1.36
--- src/distrib/notes/alpha/install:1.35 Thu Apr 23 01:56:48 2009
+++ src/distrib/notes/alpha/install Sat Apr 25 10:34:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.35 2009/04/23 01:56:48 snj Exp $
+.\" $NetBSD: install,v 1.36 2009/04/25 10:34:42 snj Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,38 +24,21 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-Installation of
-.Nx*M
-is now easier than ever!
-For the latest news, problem reports, and discussion, join
-the port-\*M mailing list by mailing a line saying
-.Pp
-.Dl subscribe port-\*M
-.Pp
-to
-.Mt [email protected] .
-Also, see
-.Lk http://www.NetBSD.org/
-for more information.
-.Pp
-If you encounter any problems, please report them via the mailing list or the
-.Xr send-pr 1
-program so that they can be fixed for the next release.
.Pp
To install or upgrade
.Nx ,
you need to first boot an installation
-program and then interact with the screen-menu program
+program and then interact with the menu-based program
.Ic sysinst .
The installation program actually consists of the
.Nx
kernel plus an in-memory file system of utility programs.
.Pp
-The usual procedure is to write the installation system to a floppy
-disk set and then boot from the floppies, however, there
-are now six ways to boot the
+The traditional procedure is to write the installation system to a floppy
+disk set and then boot from the floppies.
+However, there are six ways to boot the
.Nx*M
-installation system!
+installation system.
Each approach loads the exact same installation bits.
The six paths are:
.Pp
@@ -92,7 +75,7 @@
.Nx
boot program
.Ic netboot
-via bootp and download it via tftp,
+via bootp and download it via tftp.
.Ic netboot
then mounts the root file system
.Pq Pa /
@@ -254,14 +237,8 @@
.Pa /dev
with
.Ic sh ./MAKEDEV all .
-Detailed instructions on netbooting can be found by visiting the
-.Nx
-\*M platform page:
-.Lk http://www.NetBSD.org/ports/\*M/
-.Pp
-At the time of this
-release, the URL for the netbooting instructions is:
-.Lk http://www.NetBSD.org/docs/network/netboot/
+Detailed instructions on netbooting can be found by visiting
+.Lk http://www.NetBSD.org/docs/network/netboot/ .
.Pp
You'll want to map root to
.Li root
@@ -363,8 +340,7 @@
of the 21140, however.
If your system appears not to be receiving packets, this may be the problem.
(You may or may not be able to update your firmware to fix this; see
-the \*M port pages on
-.Lk http://www.NetBSD.org/
+.Lk http://www.NetBSD.org/ports/alpha/
for more information on this.)
In general, 10 Mb cards from manufacturers other than
.Tn DEC
@@ -415,359 +391,3 @@
.Pp
.so ../common/sysinst
.
-.Ss2 Manual and script-assisted installation
-.
-All of the installation procedures consist of
-putting a label on the disk to provide information on
-the sizes and placement of the partitions into which the disk
-is divided, putting the boot blocks on the disk, creating the
-file systems on the partitions, and unpacking the distribution
-tar archives.
-.
-.
-.(enum
-Disk prep: label, boot block, and file system setup
-.
-.
-.(tag "AA."
-.It "A."
-Manual Install from the Shell Prompt
-.Pp
-The normal installation involves running the install shell script
-and interactively configuring the file systems, and then simply
-unpacking the tar files into these followed by running MAKEDEV.
-.Pp
-However, as stated above it is also possible to do the installation yourself
-from the shell, and in any case it is helpful to understand
-what the install script does.
-The procedure is:
-.Pp
-.
-.
-.(bullet -compact
-create
-.Pa /etc/disktab ,
-see
-.Xr disktab 5
-.It
-run
-.Xr disklabel 8 ,
-.It
-run
-.Xr newfs 8
-.It
-.Xr mount 8
-the new root on
-.Pa /mnt
-.It
-cd to
-.Pa /usr/mdec
-and run
-.Xr installboot 8
-.bullet)
-.
-.Pp
-If you are reviewing man pages on
-.Nx
-platforms other than \*M, be sure that when reading
-.Xr installboot 8
-you read the \*M version by typing:
-.Pp
-.Dl # Ic man 8 \*M/installboot
-.Pp
-At this point you need only unpack the distribution sets by running
-.Xr tar 1
-as described below.
-.It B.
-.Pa /install
-and
-.Pa /upgrade
-traditional installation scripts
-.Pp
-The
-.Pa install
-and
-.Pa upgrade
-scripts are still there, so by exiting the
-.Ic sysinst
-program you can type
-.Li install
-or
-.Li upgrade
-at the shell prompt and run them as you did in the good old days.
-.Pp
-You may install
-on either a SCSI or an IDE disk; you will be prompted for
-the disk to install on.
-The disks in your system will be numbered starting at
-.Em x Ns Li d0
-(where
-.Em x
-is an
-.Sq Li s
-for SCSI disks,
-.Sq Li w
-for IDE disks) based on the SCSI-ID or IDE drive order; if you have
-more than one disk, watch the boot messages carefully to see
-which ones are probed as which numbers.
-.Pp
-Once you've selected a disk to install on, you'll be prompted
-for the geometry.
-This is also displayed in the boot messages,
-and you'll be given a chance to review the boot messages again
-to get the exact figures for the number of cylinders, heads
-and sectors.
-.Pp
-After this you must specify the size of your partitions.
-Generally you'll be giving the sizes in cylinders; the install
-program will tell you how many bytes there are in each cylinder.
-.Pp
-The swap partition is the second thing you specify, after the
-.Pa /
-(root) partition.
-Regardless of the size of your disk, you'll
-want to specify a swap partition that's at least as large as
-the amount of RAM you have, and probably not less than 64 MB
-in any case.
-.Pp
-If you have a small disk (under 500 MB), it's probably best to
-devote all of the disk (excepting 64 MB or more for the swap)
-to the
-.Pa /
-(root) partition.
-.Pp
-With enough swap space configured, you can make
-.Pa /tmp
-a nice, fast mfs.
-See
-.Xr mount_mfs 8 ,
-and note that the mfs will require swap space for
-the largest planned amount of
-.Pa /tmp
-storage.
-It doesn't return space when files are deleted,
-but just keeps it its own freelist so the swap space required is
-equal to the highwater mark of
-.Pa /tmp
-use, plus space required to back up main memory and store inactive images.
-.Pp
-Once you've specified this information, the install script will
-write the disklabel, install boot blocks to make the disk
-bootable, initialise the file systems, and mount them all under
-.Pa /mnt .
-You are now ready to go on to the next step.
-.
-.tag)
-.
-.
-.It
-Configuration: arranging access to the distribution sets
-.Pp
-After doing the disk and file system setup with either
-shell commands or the script assist, you then need only
-unpack the distribution sets with the
-.Xr tar 1
-command.
-To do this you will need access from the target host to the tar files
-that contain the operating system in order to extract them to your disk.
-This is done via an NFS or FTP transfer over a network,
-via a CD-ROM archive, a tape archive, or by preloading an accessible hard
-drive with the necessary tar files.
-.
-.
-.(bullet
-Preparing to Install from a CD-ROM
-.Pp
-All you need to do is mount the CD-ROM, which will generally
-be device cd0.
-(The initial boot messages will tell you what
-the CD-ROM drive is probed as.)
-This would be done with:
-.Pp
-.Dl # Ic "mount -r -t cd9660 /dev/cd0a /mnt2"
-.It
-Preparing to Install from the Network
-.Pp
-The first thing you need to do is configure the loopback network
-interface, which is done with the command
-.Pp
-.Dl # Ic "ifconfig lo0 127.0.0.1"
-.Pp
-Then you will have to configure your Ethernet card.
-The command
-.Pp
-.Dl # Ic "ifconfig -l"
-.Pp
-will give you a list of the network interfaces on your system.
-It will show you your ethernet cards first, followed by lo0
-(the loopback interface that we configured above), ppp0 (the
-PPP interface) and sl0 (the SLIP interface).
-.Pp
-To configure your ethernet card, type
-.Ic ifconfig Ar if Li inet
-.Ar addr
-.Op Li netmask
-.Op Li media Ar media
-where
-.Ar if
-is the network card (interface), almost always
-.Li de0 ,
-.Ar addr
-is the IP address, the optional
-.Ar netmask
-parameter is the network mask,
-and the optional
-.Ar media
-parameter is one of:
-.
-.
-.Bl -column "10baseT/UTPxx" "T4 twisted pair interfacexx" "100 Mbpsxxxx" \
- -offset indent
-.It 10base2 Ta BNC connector Ta 10 Mbps
-.It AUI Ta AUI connector Ta 10 Mbps
-.It 10baseT/UTP Ta Twisted pair connector Ta 10 Mbps
-.It 100baseTX Ta Twisted pair connector Ta 100 Mbps
-.It 100baseFX Ta Fibre-optic connector Ta 100 Mbps
-.It 100baseT4 Ta T4 twisted pair interface Ta 100 Mbps
-.El
-.
-.
-.Pp
-If the host you are getting the data files from is not on the
-local network, you will also have to configure a gateway into your system.
-Do this with
-.Pp
-.Dl # Ic "route add default \*[Lt]gateway-IP-address\*[Gt]"
-.Pp
-One improvement over the good old days is that the resolver is now
-present; by configuring
-.Pa /etc/resolv.conf
-you can get name resolution during any install NFS or FTP operations.
-.Pp
-Once networking has been configured, you may mount the directory
-with the install files via NFS, or download them via FTP.
-.Pp
-To mount them via nfs, type
-.Pp
-.Dl # Ic "mount -t nfs \*[Lt]hostname:/path/to/nfs/volume\*[Gt] /mnt2"
-.Pp
-If this volume has been exported read-only, you may need the
-.Fl r
-option to mount.
-.Pp
-To download the install sets with ftp, create a directory in
-which to put them and then use the ftp client to download them.
-Mirror sites are listed at:
-.Lk http://www.NetBSD.org/mirrors/
-A typical session might be:
-.Pp
-.Dl # Ic mkdir /mnt/usr/release
-.Dl # Ic cd /mnt/usr/release
-.Dl # Ic ftp ftp.NetBSD.org
-.D1 Em "the following commands are given to the " Ic ftp Em "program after logging in"
-.Dl ftp\*[Gt] Ic "prompt"
-.Dl ftp\*[Gt] Ic "cd /pub/NetBSD/NetBSD-\*V/\*M/binary/sets"
-.Dl ftp\*[Gt] Ic "mget *"
-.Dl ftp\*[Gt] Ic "quit"
-.Pp
-Feel free, of course, to leave off the sets that you don't need
-if you don't plan to install everything.
-.
-.bullet)
-.
-.It
-Unpack distribution sets: Extracting the Operating System Files
-.
-.Pp
-Change to the root directory of your hard
-drive (which is
-.Pa /mnt
-if you've used the standard install script
-to this point) by typing
-.Pp
-.Dl # Ic "cd /mnt"
-.Pp
-For this and the following commands, replace
-.Pa /mnt/usr/release/
-with the path to your NFS volume or CD-ROM if that's how you
-chose to access your install files instead.
-.Pp
-The sets and kernel are extracted with:
-.Pp
-.Dl # Ic "cd /mnt"
-.Dl # Ic "for i in base kern comp etc games man misc text; do"
-.Dl Ic "\ \ \ \ tar -zxpf /mnt/usr/release/$i.tgz;"
-.Dl # Ic "done"
-.Pp
-or perhaps:
-.Pp
-.Dl # Ic "cd /mnt"
-.Dl # Ic "for i in /mnt/usr/release/*.tgz; do"
-.Dl Ic "\ \ \ \ echo $i"
-.Dl Ic "\ \ \ \ tar -zxpf $i"
-.Dl # Ic "done"
-.Pp
-Now make the device nodes:
-.Pp
-.Dl # Ic "cd /mnt/dev"
-.Dl # Ic "sh ./MAKEDEV all"
-.It
-Restart your system
-.Pp
-Unmount the file systems and halt.
-The exact instructions to type here will depend on the file systems
-you created, but typically the commands are:
-.Pp
-.Dl # Ic "cd /"
-.Dl # Ic "umount /mnt/usr"
-.Dl # Ic "umount /mnt"
-.Dl # Ic "sync"
-.D1 Pq Ic sync Em "is not strictly necessary but it is traditional"
-.Dl # Ic "halt"
-.Pp
-You should now be at the SRM console's
-.Li \*[Gt]\*[Gt]\*[Gt]
-prompt and can reboot
-into the new configuration (possibly after an optional power cycle)
-with a command such as:
-.Pp
-.Dl \*[Gt]\*[Gt]\*[Gt] Ic "boot dka0"
-.Pp
-This command might be:
-.Ic "boot dka100"
-if your drive is on ID 1.
-You can usually use
-.Ic "show device"
-to see a full list of bootable devices in your system.
-Your system will come up in single-user mode, ready for you to configure it.
-.
-.enum)
-.
-.
-.Pp
-You can create the floppy needed for installation
-under
-.Tn MS-DOS
-or
-.Tn Windows .
-Supposing your 1.44 MB floppy
-drive is drive A:, and your CD is drive
-.Ic E: ,
-do the following from an
-.Tn MS-DOS
-command prompt:
-.Pp
-.Dl Ic "e:\&"
-.Dl Ic "cd \eNetBSD-\*V\einstallation\emisc"
-.Dl Ic "rawrite"
-.Pp
-When asked for a source filename, answer
-.Pp
-.Dl "\&...\efloppy\edisk1of2
-.Pp
-When asked for a destination drive answer
-.Pp
-.Dl \&a
-.Pp
-(Repeat the procedure for
-.Pa installation/floppy/disk2of2 . )
Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.153 src/distrib/notes/common/contents:1.154
--- src/distrib/notes/common/contents:1.153 Sat Apr 25 01:33:12 2009
+++ src/distrib/notes/common/contents Sat Apr 25 10:34:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.153 2009/04/25 01:33:12 snj Exp $
+.\" $NetBSD: contents,v 1.154 2009/04/25 10:34:43 snj Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -54,11 +54,18 @@
A gzipped
.Nx
kernel containing code for everything supported in this release.
+.if \n[amd64] \{\
+. It Pa netbsd-INSTALL.gz
+The installation kernel.
+. It Pa netbsd-INSTALL_XEN3_DOMU.gz
+. It Pa netbsd-XEN3_DOM0.gz
+. It Pa netbsd-XEN3_DOMU.gz
+.\} \" amd64
.if \n[hpcmips] \{\
This kernel runs on Vr41xx and TX3922 CPUs only.
.\} \" hpcmips
.\} \" !atari/mac68k/sgimips/evgppc
-.if \n[macppc]:\n[sparc]:\n[sparc64] \{\
+.if \n[alpha]:\n[macppc]:\n[sparc]:\n[sparc64]:\n[vax] \{\
. It Pa netbsd-GENERIC.MP.gz
A gzipped
.Nx
@@ -233,6 +240,10 @@
.
. (tag kernel/ -compact
.
+.if \n[i386]:\n[amd64] \{\
+. It Pa cdrom/
+\*M bootable cdrom images; see below.
+.\}
.if \n[sparc] \{\
. It Pa bootfs/
Netbootable RAM disk kernel and the file system in the RAM disk; see below.
@@ -243,26 +254,14 @@
. It Pa floppy/
\*M boot and installation floppies; see below.
.\}
-.if \n[i386]:\n[amd64] \{\
-. It Pa cdrom/
-\*M bootable cdrom images; see below.
-.\}
.
.if \n[alpha] \{\
. It Pa diskimage/
-. It Pa tapeimage/
an image file
.Pa cdhdtape
is included for the case where the installer is written to
a CD, hard drive, or tape.
-This image file is the same for the CD, HD, and tape cases, but a separate
-.Pa tapeimage/
-directory exists to hold a copy of the
-.Pa README
-file and to meet the
-.Nx
-.Xr release 7
-standard.
+This image file is the same for the CD, HD, and tape cases.
. It Pa instkernel/
contains a
.Pa netbsd.gz
@@ -290,24 +289,14 @@
\*M miniroot file system image; see below.
.\}
.
-.if !\n[cats]:\n[evbppc]:\n[mvme68k]:\n[macppc]:\n[sgimips]:\n[sparc]:\n[xen] \{\
+.if !\n[alpha]:\n[cats]:\n[evbppc]:\n[mvme68k]:\n[macppc]:\n[sgimips]:\n[sparc]:\n[xen] \{\
. It Pa misc/
.
-.ie \n[alpha] \{\
-contains
-.Pa GENERIC.fs ,
-a
-.Li GENERIC
-kernel in a bootable file system image.
-This is used in some unusual installations as described in the next section.
-.\}
-.el \{\
Miscellaneous \*M installation utilities; see
.if \n[mac68k] \{\
the Traditional method
.\}
-installation section, below.
-.\}
+installation section below.
.\}
.
.if \n[hp300] \{\
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.444 src/distrib/notes/common/main:1.445
--- src/distrib/notes/common/main:1.444 Sat Apr 25 01:33:12 2009
+++ src/distrib/notes/common/main Sat Apr 25 10:34:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.444 2009/04/25 01:33:12 snj Exp $
+.\" $NetBSD: main,v 1.445 2009/04/25 10:34:43 snj Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -464,7 +464,7 @@
The result of these improvements is a stable operating system fit for
production use that rivals most commercially available systems.
.Pp
-It is impossible to completely summarize more than a year of development that
+It is impossible to completely summarize the massive development that
went into the
.Nx
\*V release.
@@ -1986,8 +1986,7 @@
Added the -A option, to display information about all processes. Use
.Dq O
for LSONPROC like Solaris instead of bundling LSIDL, LSRUN, and LSONPROC to
-.Dq R
-.
+.Dq R .
.It
.Xr ksh 1 :
Fixed POSIX mode interpretation of backslashes inside backquotes inside double quotes.
@@ -2062,6 +2061,8 @@
Workaround: generate a core file from the program using
.Xr gcore 1
and pass the core to gdb, instead of debugging the running program.
+.Pp
+Statically linked binaries using pthreads are currently broken.
.
.\} \" \n[FOR_RELEASE]
.
@@ -2116,14 +2117,14 @@
More information on the
.Nx
Foundation, its composition, aims, and work can be found at:
-.Lk http://www.NetBSD.org/foundation/
+.Lk http://www.NetBSD.org/foundation/ .
.br_ne 10P
.
.Ss "Sources of NetBSD"
.Pp
.
Refer to
-.Lk http://www.NetBSD.org/mirrors/.
+.Lk http://www.NetBSD.org/mirrors/ .
.br_ne 10P
.
.Ss "NetBSD \*V Release Contents
@@ -2342,7 +2343,7 @@
.It
Running an older userland inside a chroot'ed environment on a 5.0 system.
.It
-Running older statically-linked pthread applications.
+Running older statically linked pthread applications.
.bullet)
.Pp
The 5.0 kernel defaults to
Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.97 src/distrib/notes/common/sysinst:1.98
--- src/distrib/notes/common/sysinst:1.97 Sat Apr 25 01:33:12 2009
+++ src/distrib/notes/common/sysinst Sat Apr 25 10:34:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysinst,v 1.97 2009/04/25 01:33:12 snj Exp $
+.\" $NetBSD: sysinst,v 1.98 2009/04/25 10:34:43 snj Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -178,10 +178,8 @@
What you need.
.(bullet
The distribution sets (in this example, they are on CD).
-.if !\n[i386]:\n[pmax]:\n[sgimips]:\n[sparc64] \{\
+.if !\n[alpha]:\n[amd64]:\n[i386]:\n[pmax]:\n[sgimips]:\n[sparc64] \{\
.It
-.ie \n[alpha] Three floppy disks.
-.el \{\
.ie \n[ews4800mips] Two floppy disks.
.el \{\
.ie \n[hp700] \{\
@@ -202,8 +200,8 @@
See the "prepare" section about obtaining those.
.\}
.el One 1.44 MB 3.5" floppy.
-.\}\}\}\}\}\}
-.\} \" !\n[pmax]:\n[sgimips]:\n[sparc64]
+.\}\}\}\}
+.\} \" !\n[alpha]:\n[i386]:\n[pmax]:\n[sgimips]:\n[sparc64]
.if \n[mac68k] \{\
.It
A Macintosh with a 68020 and MMU, 68030 or 68RC040 processor.
@@ -212,8 +210,9 @@
.\}
.It
A CD-ROM drive
-.ie \n[acorn26]:\n[atari]:\n[alpha]:\n[cats]:\n[evbppc]:\n[i386]:\n[macppc]:\n[sparc64] (SCSI or ATAPI),
+.ie \n[acorn26]:\n[atari]:\n[alpha]:\n[amd64]:\n[cats]:\n[evbppc]:\n[i386]:\n[macppc]:\n[sparc64] (SCSI or ATAPI),
.el (SCSI),
+.ie !\n[amd64] \{\
a hard disk and a minimum of
.if \n[acorn26] 8 MB
.if \n[alpha] 32 MB
@@ -233,10 +232,13 @@
.if \n[sparc64] 32 MB
.if \n[sgimips] 16 MB
of memory installed.
+\}
+.el and a hard disk.
.It
The hard disk should have at least
.if \n[acorn26] 200
.if \n[alpha] 200
+.if \n[amd64] 200
.if \n[arc] 200
.if \n[atari] 120
.if \n[cats] 200
@@ -262,7 +264,7 @@
If you wish to install the X Window System as well, you will need at least
215 MB more.
.bullet)
-.if \n[alpha]:\n[ews4800mips]:\n[news68k]:\n[newsmips] \{\
+.if \n[ews4800mips]:\n[news68k]:\n[newsmips] \{\
.It
Creating the boot floppies.
You can create the floppies needed for installation
@@ -277,7 +279,7 @@
command prompt:
.Pp
.Dl Ic "e:"
-.Dl Ic "cd \eNetBSD-\*V\alpha\einstallation\emisc"
+.Dl Ic "cd \eNetBSD-\*V\ei386\einstallation\emisc"
.Dl Ic "rawrite"
.Pp
When asked for a source filename, answer
@@ -287,7 +289,6 @@
.Dl Pa \&..\efloppy\eboot2.fs
for the second diskette.
.\}
-.if \n[alpha] .Dl Em \&(...alpha installation root) Ns Pa \efloppy\edisk1of3
.if \n[news68k] .Dl Pa \eNetBSD-\*V\e\*M\einstallation\efloppy\eboot.fs
.Pp
When asked for a destination drive answer
@@ -301,7 +302,7 @@
.Pp
.Dl # Ic "dd if=.../boot1.fs of=/dev/rfd0a bs=18k"
.Pp
-.\} \" \n[alpha]:\n[ews4800mips]:\n[news68k]:\n[newsmips]
+.\} \" \n[ews4800mips]:\n[news68k]:\n[newsmips]
.if \n[mac68k] \{\
.It
The NetBSD Boot Tools folder.
@@ -388,17 +389,21 @@
.Pp
The main menu will be displayed.
.\} \" \n[mac68k]
-.ie \n[i386] \{\
-Insert the CD-ROM or DVD into the drive and boot the computer.
-.\}
-.el \{\
-Insert the first boot floppy you just created and boot the computer.
+.ie \n[alpha]:\n[amd64]:\n[i386] \{\
+Insert the CD into the drive and boot the computer.
.if \n[alpha] \{\
Type
.Pp
-.Dl \&\*[Gt]\*[Gt]\*[Gt] Ic "B DVA0"
-.Pp
+.Dl \&\*[Gt]\*[Gt]\*[Gt] Ic "B DQA0"
+.(Note
+This is only an example, and
+.Dv DQA0
+may not be the proper device, depending on your hardware configuration.
+.Note)
+.\}
.\}
+.el \{\
+Insert the first boot floppy you just created and boot the computer.
.if \n[ews4800mips] \{\
Change boot device to floppy on the PROM menu which is invoked by
pressing ESC key right after hardware checks, and boot the computer again.
@@ -500,7 +505,7 @@
.It
After all the files have been unpacked, go back to
the main menu and select
-.ie \n[i386]:\n[mac68k]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
+.ie \n[alpha]:\n[amd64]:\n[i386]:\n[mac68k]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
.Me reboot.
.\}
.el \{\
@@ -661,7 +666,7 @@
.el \{\
Boot your machine.
The boot loader will start, and will print a countdown and begin booting.
-.if !\n[i386] \{
+.if !\n[alpha]:\n[amd64]:\n[i386] \{
.Pp
If the boot loader messages do not appear in a reasonable
amount of time, you either have a bad boot floppy or a
@@ -680,7 +685,7 @@
.Nx
will be probing your system to discover which hardware devices are
installed.
-.\}
+.\} \" !\n[alpha]:\n[i386]
.if \n[atari]:\n[i386] \{\
You may want to read the
boot messages, to notice your disk's name and geometry.
@@ -710,7 +715,7 @@
.Li sd1
the second, etc.
.Pp
-.if !\n[atari]:\n[i386]:\n[mac68k] \{\
+.if !\n[alpha]:\n[amd64]:\n[atari]:\n[i386]:\n[mac68k] \{\
Note that once the system has finished booting, you need not
leave the floppy in the disk drive.
.\}
@@ -736,7 +741,7 @@
use networking during the installation, you can specify these
parameters later.
If you are not using the Domain Name System (DNS),
-you can give an empty response to questions about this.
+you can give an empty response when asked to provide a server.
.if \n[mac68k] \{\
.It
.To 2 "Preparing a disk for Mac OS and NetBSD"
@@ -1481,7 +1486,7 @@
.Ic sysinst
will do this for you, asking you
if you want to use DHCP.
-If you do not use DHCP, you can enter in network configuration
+If you do not use DHCP, you can enter network configuration
details yourself.
If you do not have DNS set up for the machine that you
are installing on, you can just press
@@ -1508,7 +1513,7 @@
.Ic sysinst
will do this for you, asking you
if you want to use DHCP.
-If you do not use DHCP, you can enter in network configuration
+If you do not use DHCP, you can enter network configuration
details yourself.
If you do not have DNS set up for the machine that you
are installing on, you can just press
@@ -1594,7 +1599,7 @@
extracted; the name of each file that is extracted will be shown.
This can slow down the installation process considerably
on machines with slow graphics consoles or serial consoles.
-Alternatively, you choose to see a progress bar.
+Alternatively, you can choose to see a progress bar.
This is the preferred option as it shows progress without significantly
slowing down the installation process.
.Pp
@@ -1606,7 +1611,7 @@
otherwise,
.\}
.el After all the files have been extracted,
-all the necessary device node files will be created.
+the device node files will be created.
If you have already configured networking, you will be asked if you want to
use this configuration for normal operation.
If so, these values will be installed in the network configuration files.
Index: src/distrib/notes/common/xfer
diff -u src/distrib/notes/common/xfer:1.64 src/distrib/notes/common/xfer:1.65
--- src/distrib/notes/common/xfer:1.64 Sat Apr 25 01:33:12 2009
+++ src/distrib/notes/common/xfer Sat Apr 25 10:34:43 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: xfer,v 1.64 2009/04/25 01:33:12 snj Exp $
+.\" $NetBSD: xfer,v 1.65 2009/04/25 10:34:43 snj Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -196,7 +196,7 @@
.Pp
If you have an i386 machine which runs
.Tn MS-DOS
-and use them to write the floppy image(s) to floppy disk,
+and use it to write the floppy image(s) to floppy disk,
you can use the
.Ic rawrite
utility, provided in the
@@ -222,14 +222,14 @@
.Nx*M
has been installed.
.Pp
-If your machine doesn't have any SCSI disks, or SCSI interface
+If your machine doesn't have any SCSI disks, or the SCSI interface
on your machine is not supported, it can still run
.Nx*M
diskless.
No file transfer is needed, and all you have to do is to prepare files on
the server.
-More information about diskless setting can be found at
-.Lk http://www.NetBSD.org/docs/network/netboot/
+More information about diskless setups can be found at
+.Lk http://www.NetBSD.org/docs/network/netboot/ .
.Pp
.if \n[ews4800mips] \{\
The PROM uses the ordinary tftp protocol, so
@@ -451,8 +451,8 @@
.\} \" \n[x68k]
.
.if !\n[hp700]:\n[x68k] \{\
-Note that if you are installing or upgrading from a writable media,
-the media can be write-protected if you wish.
+Note that if you are installing or upgrading from writable media,
+it can be write-protected if you wish.
These systems mount a root image from inside the kernel, and will not
need to write to the media.
If you booted from a floppy, the floppy disk may be removed from
@@ -567,8 +567,8 @@
.
.It Em MS-DOS floppy
.Nx
-doesn't include split sets to keep the distribution size down.
-They can be created on a separate machine using the
+does not include split distribution sets for installation by floppy.
+However, they can be created on a separate machine using the
.Xr split 1
command, running e.g.
.Ic split -b 235k base.tgz base.
@@ -667,14 +667,6 @@
from scratch, go to the section on preparing your hard disk, below.
If you're upgrading an existing installation, go directly to
the section on upgrading.
-.(Note
-This method of installation is recommended for those familiar
-with using
-.Bx
-network configuration and management commands.
-If you aren't, this documentation should help, but is not intended to
-be all-encompassing.
-.Note)
.
.if \n[x68k] \{\
.It Em M-O disk
@@ -740,14 +732,6 @@
from scratch, go to the section on preparing your hard disk, below.
If you're upgrading an existing installation, go directly to the
section on upgrading.
-.(Note
-This method of installation is recommended for those already
-familiar with using
-.Bx
-network configuration and management commands.
-If you aren't, this documentation should help, but is not intended to
-be all-encompassing.
-.Note)
.
.It Em Tape
To install
