update from netbsd

7 files changed, 166 insertions, 94 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 2c728e54e55..b913bb10f13 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -6,8 +6,7 @@ out as follows:
 			binary/		amiga binary distribution sets;
 					see below.
 
-			floppies/	amiga installation and upgrade
->>>                     ^^^^^^^^ should this be miniroot/?
+			miniroot/	amiga installation and upgrade
 					file system images; see below.
 
 			security/	amiga security distribution;
@@ -17,8 +16,7 @@ out as follows:
 					installation utilities; see
 					installation section, below.
 
-There are two amiga file system images to be found in the "amiga/floppy"
->>>                                                              ^^^^^^
+There are two amiga file system images to be found in the "amiga/miniroot"
 subdirectory of the NetBSD 1.1 distribution.  One of them is a upgrade
 image and one is an installation image. They are described in more
 detail below.  There are gzipped versions of each available, for easier
@@ -43,16 +41,16 @@ Upgrade file system:
 
 	This file contains a BSD root file system setup to help
 	you upgrade a previous version of NetBSD.  This includes
-	converting existing partitions
-	and mounting your root and /usr partitions and getting
-	ready to extract (and possibly first fetching) the distribution
-	sets.  There is enough on this file system to allow you to
-	make a slip or ppp connection, configure an ethernet, mount an
-	NFS file system or ftp.  You can also load distribution sets from
-	a SCSI tape, from one of your existing AmigaDOS partitions, or
-	from an existing NetBSD partition.
+	converting existing partitions and mounting your root and
+	/usr partitions and getting ready to extract (and possibly
+	first fetching) the distribution sets.  There is enough on
+	this file system to allow you to make a slip or ppp connection,
+	configure an ethernet, mount an NFS file system or ftp.
+	You can also load distribution sets from a SCSI tape, from
+	one of your existing AmigaDOS partitions, or from an existing
+	NetBSD partition.
 
-	This file is named "inst-11.fs".
+	This file is named "upgr-11.fs".
 
 The NetBSD/amiga binary distribution sets contain the binaries which
 comprise the NetBSD 1.1 release for the amiga.  There are seven binary
@@ -66,8 +64,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		system to run and be minimally functional.  It
 		includes shared library support, and excludes
 		everything described below.
-		[ 7M gzipped, 19M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 7M gzipped, 20M uncompressed ]
 
 	comp11	The NetBSD/amiga Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN (yes, there are two!).
@@ -78,8 +75,7 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		set).  This set also includes the manual pages for all
 		of the utilities it contains, as well as the system
 		call and library manual pages.
-		[ 4M gzipped, 12M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 5M gzipped, 15M uncompressed ]
 
 	etc11	This distribution set contains the system
 		configuration files that reside in /etc and in several
@@ -88,32 +84,27 @@ subdirectory of the NetBSD 1.1 distribution tree, and are as follows:
 		used if you are upgrading.  (If you are upgrading,
 		it's recommended that you get a copy of this set and
 		CAREFULLY upgrade your configuration files by hand.)
-		[ 50K gzipped, 280K uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 60K gzipped, 340K uncompressed ]
 
 	games11	This set includes the games and their manual pages.
-		[ 1M gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 3M gzipped, 7M uncompressed ]
 
 	man11	This set includes all of the manual pages for the
 		binaries and other software contained in the base set.
 		Note that it does not include any of the manual pages
 		that are included in the other sets.
-		[ 730K gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 850K gzipped, 3M uncompressed ]
 
 	misc11	This set includes the system dictionaries (which are
 		rather large), the typesettable document set, and
 		man pages for other architectures which happen to be
 		installed from the source tree by default.
-		[ 2M gzipped, 6M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+		[ 2M gzipped, 7M uncompressed ]
 
 	text11	This set includes NetBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 784K gzipped, 3M uncompressed ]
->>>               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The amiga security distribution set is named "secr11" and can be found
 in the "amiga/security" subdirectory of the NetBSD 1.1 distribution
@@ -122,8 +113,7 @@ algorithm) and the binaries which depend on it.  It can only be found
 on those sites which carry the complete NetBSD distribution and that
 can legally obtain it.  (Remember, because of United States law, this
 distribution set may not be exported to locations outside of the
-United States and Canada.)  [ 119K gzipped, 300K uncompressed ]
->>>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+United States and Canada.)  [ 128K gzipped, 307K uncompressed ]
 
 The amiga binary distribution sets are distributed in the same form as
 the source distribution sets; catted together, the members of a set
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 513236ac7cd..9171e41877e 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,7 +1,6 @@
 NetBSD/amiga 1.1 runs on any amiga that has a 68020 or better CPU
 with some form of FPU and MMU.  The minimal configuration requires
 4M of RAM and about 65M of disk space.  To install the entire system
->>>                 ^^^
 requires much more disk space, and to run X or compile the system,
 more RAM is recommended.  (4M of RAM will actually allow you to
 compile, however it won't be speedy.  X really isn't usable on a
@@ -13,13 +12,16 @@ Here is a table of recommended HD partition sizes for a full install:
 	user (/usr)	65M	100M	45M 	80M
 	swap		----- 2M for every M ram -----
 	local (/local)	up to you
->>> adjust sizes?
+
 
 As you may note the recommended size of /usr is 20M greater than
 needed. This is to leave room for a kernel source and compile tree
 as you will probably want to compile your own kernel. (GENERIC is
 large and bulky to accommodate all people).
 
+If you only have 4M of fast memory, you should make your swap partition
+larger, as your system will be doing much more swapping.
+
 Supported devices include:
 	A4000/A1200 IDE controller.
 	SCSI host adapters:
@@ -34,12 +36,14 @@ Supported devices include:
 		GVP Spectrum.
 		Piccalo.
 		A2410.
+		Cybervision 64.
 	Ethernet controllers:
 		A2065 Ethernet
 		Hydra Ethernet
 		ASDG Ethernet
 		A4066 Ethernet
 		Ariadne Ethernet
+		Quicknet Ethernet
 	Arcnet controllers:
 		A2060 Arcnet
 	Tape drives:
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 5b73f335e75..32da106be2a 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -11,36 +11,48 @@ installed on your hard disk.  If you wish to stop the installation,
 you may hit Control-C at any prompt, but if you do, you'll have to
 begin again from scratch.
 
->>>	transfer installation file system to the swap partition.
->>>	Does this go here, or in the hard disk prep section?
+	Transfer the install miniroot filesystem onto the hard disk
+	partition used by NetBSD for swapping, as described in the
+	"Preparing your System for NetBSD Installation" section above.
+
+	You then need to have "ixemul.library" in your LIBS: directory
+	on AmigaDOS.  You also need to have the "loadbsd" program
+	in your command path.  If AmigaDOS complains about loadbsd
+	not being an executable file, be sure that the "Execute"
+	protection bit is set.  If not, set it with the command:
+		Protect loadbsd add e
 
->>>	Getting loadbsd, ixemul.library, and netbsd onto AmigaDOS
->>>	partition.
 	Next you need to get yourself into NetBSD by loading the
 	kernel from AmigaDOS with loadbsd like so:
 
 		loadbsd -b netbsd
 
+	If you have an AGA machine, and your monitor will handle
+	the dblNTSC mode, you may also include the "-A" option to
+	enable the dblNTSC display mode.
+
 	You should see the screen clear and some information about
 	your system as the kernel configures the hardware.  Note which
 	hard disk device(s) are configured (sd0, sd1, etc).  Then
 	you will be prompted for a root device.  At this time type
-	'sd0*'.
->>>	Need to document what device number to actually use.
+	'sd0*', where '0' is the device which contains the swap
+	partition you created during the hard disk preparation.
 
 	The system should continue to boot.  For now ignore WARNING:
-	messages about bad dates in clocks and swap space.  Eventually
->>>	                                       ^^^^^^^^^^???
-	you will be asked to enter the pathname of the shell, just
-	hit return.  After a short while you should see a welcome
-	message and a prompt, asking if you wish to proceed with the
-	installation.
+	messages about bad dates in clocks.  Eventually you will be
+	asked to enter the pathname of the shell, just hit return.
+	After a short while you should see a welcome message and a
+	prompt, asking if you wish to proceed with the installation.
 
 	If you wish to proceed, enter "y" and then return.
 
 	If you have configured your hard drive[s] correctly it
 	should find the drive and partition that you selected to
-	use as your root.
+	use as your root.  You will be prompted for which device
+	you want to use for your root.  If you have multiple disks
+	present with root partitions defined, you will need to be
+	sure you enter the device name of the correct partition you
+	want to install NetBSD on.
 
 	YOU ARE NOW AT THE POINT OF NO RETURN.  If you confirm that
 	you want to install NetBSD, your hard drive will be modified,
@@ -192,7 +204,6 @@ begin again from scratch.
 		for the installation files.  /mnt/usr/distrib is
 		suggested.
 
->>> Document using ppp or slip?
 		Configure the appropriate ethernet interface i.e. le0
 		if you have a 2065 or ed0 if you have a AMIGNET from
 		Hydra Systems.
@@ -211,6 +222,11 @@ begin again from scratch.
 
 			ifconfig ed0 128.32.240.167 netmask 0xffffff00
 
+		You should also be able to use SLIP or PPP as the network
+		connection.
+		[XXX instructions for ppp or slip would be usefull
+		perhaps the next release]
+
 		If the NFS server or FTP server is not on a directly-
 		connected network, you should set up a route to it
 		with the command:
@@ -267,8 +283,9 @@ network configuration information.
 
 Once you have supplied `Configure' all that it requests, your machine
 will be configured well enough that when you reboot it it will
-almost be a completely functional NetBSD system.  Note you should
-ignore the errors from `chown' they will be corrected shortly.
+almost be a completely functional NetBSD system.
+
+>>> Copy the kernel from the miniroot filesystem at this point <<<
 
 Once you are done with `Configure', halt the system with the "halt"
 command (wait for "halted" to be displayed) and reboot.  Then again
@@ -282,12 +299,6 @@ like so:
 
 	mount -av
 
-Next you need to re-make your devices to get the ownership correct:
-
-	cd /dev
-	MAKEDEV all
->>> Is this step still needed? - check on it!
-
 Your system is now complete but not completely configured; you
 should adjust the /etc/sendmail.cf file as necessary to suit your
 site and/or disable sendmail and other network related programs.
@@ -295,6 +306,15 @@ These things can be found in /etc/netstart.  Use vi, if you installed
 the man pages you can type `man vi' or `man ed' for instructions
 on how to use these somewhat non-intuitive editors.
 
+You should also put a copy of the netbsd kernel in your root partition.
+This can be done easily by mounting the AmigaDOS partition containing
+the kernel you used to start NetBSD and copying the "netbsd" file to
+the root:
+	mount -r -t ados /dev/sd0d /mnt
+	cp /mnt/netbsd /
+(where /dev/sd0d is the AmigaDOS partition where you have netbsd, and
+/mnt/netbsd is the appropriate path of the netbsd file).
+
 Once you are done with the rest of configuration unmount your file
 systems and halt your system, then reboot:
 
@@ -310,5 +330,3 @@ functional:
 
 When it boots off of the hard drive, you will have a complete
 NetBSD system!  CONGRATULATIONS! (You really deserve them!!!)
-
->>> Missing the step to transfer the netbsd kernel to /
diff --git a/distrib/notes/amiga/legal b/distrib/notes/amiga/legal
index 2a4b4e547b6..2fe233811a8 100644
--- a/distrib/notes/amiga/legal
+++ b/distrib/notes/amiga/legal
@@ -1,7 +1,28 @@
+	This product includes software developed by Klaus Burkert.
+
+	This product includes software developed by Michael van Elst.
+
+	This product includes software developed by Bernd Ernesti.
+
+	This product includes software developed by Michael L. Hitch.
+
 	This product includes software developed by Christian E. Hopps.
 
-	This product includes software developed by Timo Rossi
+	This product includes software developed by Mika Kortelainen.
+
+	This product includes software developed by Jukka Marin.
+
+	This product includes software developed by Kari Mettinen.
+
+	This product includes software developed by Brad Pepers.
+
+	This product includes software developed by Ignatios Souvatzis.
+
+	This product includes software developed by Ezra Story.
+
+	This product includes software developed by Lutz Vieweg.
+
+	This product includes software developed by Daniel Widenfalk.
 
-	This product includes software developed by Michael L. Hitch
+	This product includes software developed by Markus Wild.
 
->>> any others?
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 7e7f8c2919d..e7d1f07fd33 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -76,5 +76,46 @@ Preparing you hard disk with HDToolBox:
 	Once this is done NetBSD/amiga will be able to recognize your
 	disks and which partitions it should use.
 
->>> Should the miniroot transfer to the swap partition instructions
->>> go here?
+Transferring the miniroot filesystem:
+
+	The NetBSD/amiga installation or upgrade now uses a "miniroot"
+	fileystem which is installed on the partition used by NetBSD
+	for swapping.  This removes the requirement of using a floppy
+	disk for the filesystem used by the installation or upgrade
+	process.  It also allows more utilities to be present on the
+	filesystem than would be available when using an 880K floppy
+	disk.
+
+	Once the hard disk has been prepared for NetBSD, the appropriate
+	miniroot filesystem (inst-11.fs for a new install or upgr-11.fs
+	for an upgrade) is transferred to the swap partition configured
+	during the hard disk prep (or the existing swap parition in
+	the case of an upgrade).  The xstreamtodev utility provided in
+	the "amiga/utilities" directory can be used on AmigaDOS to
+	transfer the filesystem for either a new installation or an
+	upgrade.  The filesystem can also be transferred on an existing
+	NetBSD system for an update by using dd.  This should only be
+	done after booting NetBSD into single-user state.  It may also
+	be possible to shutdown to single-user, providing that the
+	single-user state processes are not using the swap partition.
+
+	On AmigaDOS, the command:
+		xstreamtodev -input=inst-11.fs -rdb-name=<swap partition>
+	where <swap partition> is the name you gave to the NetBSD
+	partition to be used for swapping.  Use upgr-11.fs if you
+	are going to do an upgrade of an existing NetBSD system.  If
+	xstreamtodev is unable to determine the SCSI driver device
+	name or the unit number of the specified partition, you may
+	also need to include the option "-device=<driver.name>" and/or
+	"-unit=<SCSI unit number>".
+
+	To transfer the miniroot using NetBSD, you should be booted up
+	in single user state on the current NetBSD system, or use the
+	"shutdown now" command to shutdown to single-uyser state.  Then
+	copy the miniroot using dd:
+		dd if=upgr-11.fs of=/dev/rsd0b
+	where /dev/rsd0b should be the device path of the swap partition
+	your system is configured to use.  Once the file is copied,
+	reboot back to AmigaDOS to boot the upgrade kernel.  NOTE:  the
+	release kernel is a "generic" kernel, and requires that the
+	swap partition be on the same device as the root partition.
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index d6fc606e39f..e4afcfaff8b 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -3,22 +3,19 @@ to make users upgrade by compiling and installing the 1.1 sources, and
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.  Because of the various changes to the system,
 the largest being the 64-bit file size support and shared libraries,
->>> just what are the major differences between 1.0 and 1.1??
 it is impractical to upgrade by recompiling from the sources and
 installing.
 
->>>  no kernel-copy!
-To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr-11.fs floppy image on another.  You must
->>>
-also have at least the "base11" binary distribution set available,
-so that you can upgrade with it, using one of the upgrade methods
-described above.  Finally, you must have sufficient disk space
-available to install the new binaries.  Since the old binaries are
-being overwritten in place, you only need space for the new binaries,
-which weren't previously on the system.  If you have a few megabytes
-free on each of your root and /usr partitions, you should have enough
-space.
+To do the upgrade, you must have the NetBSD kernel on AmigaDOS and
+you must transfer the upgrade filesystem upgr-11.fs onto the swap
+partition of the NetBSD hard disk.  You must also have at least the
+"base11" binary distribution set available, so that you can upgrade
+with it, using one of the upgrade methods described above.  Finally,
+you must have sufficient disk space available to install the new
+binaries.  Since the old binaries are being overwritten in place,
+you only need space for the new binaries, which weren't previously
+on the system.  If you have a few megabytes free on each of your
+root and /usr partitions, you should have enough space.
 
 Since upgrading involves replacing the kernel, and most of the system
 binaries, it has the potential to cause data loss.  You are strongly
@@ -28,20 +25,24 @@ beginning the upgrade process.
 
 To upgrade your system, follow the following instructions:
 
->>>	transfer upgrade file system image to swap partition
->>>	should this be in the hard disk prep section?
+	Transfer the upgrade miniroot filesystem onto the hard disk
+	partition used by NetBSD for swapping, as described in the
+	"Preparing your System for NetBSD Installation" section above.
 
-	Boot your machine using of the appropriate kernel-copy floppy.
-	When presented with the boot prompt (the prompt begins with
-	"Boot" and ends with ":-"), hit return.
+	Now boot up NetBSD using the 1.1 kernel using the loadbsd
+	command:
 
-	While booting, you will probably see several warnings.  You
-	should be warned that no swap space is present, and that
->>>                              ^^^^^^^^^^^^^^^^^^^^^
-	init(8) cannot find /etc/rc.  Do not be alarmed, these are
->>>     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-	completely normal.  When you reach the prompt asking you for a
-	shell name, just hit return.
+		loadbsd -b netbsd
+
+	You should see the screen clear and some information about
+	your system as the kernel configures the hardware.  Note which
+	hard disk device is configured that contains your root and
+	swap partition.  When prompted for the root device, type
+	'sd0*' (replacing 0 with the disk number that NetBSD used for
+	your root/swap device).  The '*' character indicates that the
+	root filesystem is contained on the swap partition.
+	When you reach the prompt asking you for a shell name, just
+	hit return.
 
 	You will be presented with some information about the upgrade
 	process and a warning message, and will be asked if you wish
@@ -59,9 +60,6 @@ To upgrade your system, follow the following instructions:
 	probably do it manually after the install process is complete,
 	by using "fsck -c 2". Read the fsck(8) manual page for more
 	details.
->>>  Is this needed for 1.0 to 1.1 upgrade?  Or mention that the upgrade
->>>  should be done if it wasn't previously done?  [It shouldn't hurt
->>>  to run through the upgrade steps.]
 
 	The upgrade program will then check your root file system,
 	and, if you approved, will upgrade it to the new file system
@@ -78,7 +76,6 @@ To upgrade your system, follow the following instructions:
 	If you don't already have the NetBSD distribution sets on your
 	disk, look in the installation section for information on how
 	to transfer them to your disk.
->>> NetBSD or AmigaDOS partitions...
 
 	Once the distribution sets are transferred to your disk,
 	continue here.  (Obviously, if the NetBSD distribution sets
@@ -113,8 +110,9 @@ To upgrade your system, follow the following instructions:
 	up the installation, by remaking some system databases.  When
 	it is complete, you should use "halt" to halt the system.
 
->>>	transfer new kernel to /
-
+	You will probably also want to copy the release "netbsd" kernel
+	image to your root at some point.
+	
 Your system has now been upgraded to NetBSD 1.1.
 
 After a new kernel has been copied to your hard disk, your
@@ -150,7 +148,6 @@ After a new kernel has been copied to your hard disk, your
 	NFS.  (Note that the information for mounts of type "ufs",
 	i.e. Fast File Systems, are contained in the mount(8) man
 	page.)
->>> Is this needed for 1.0 -> 1.1 upgrade?
 
 	Finally, you will want to delete old binaries that were part
 	of the version of NetBSD that you upgraded from and have since
diff --git a/distrib/notes/amiga/whatis b/distrib/notes/amiga/whatis
index bff5272d6c1..6633cbe79b0 100644
--- a/distrib/notes/amiga/whatis
+++ b/distrib/notes/amiga/whatis
@@ -1,4 +1,5 @@
 
->>> What should go here?
-This is the first public release of NetBSD for the Amiga line of
-computers.
+This is the second public release of NetBSD for the Amiga line of
+computers.  Several additional graphics and network boards are now
+supported.  Some of the SCSI drivers have been enhanced and (hopefully)
+improved.