1. Sync ABOUT.TXT changes.

2. Go back to using a filesystem on the boot floppy; the rawboot boot blocks
   were just too non-functional for other things.

4 files changed, 180 insertions, 42 deletions

diff --git a/release/ABOUT.TXT b/release/ABOUT.TXT
index de4d807..aad3665 100644
--- a/release/ABOUT.TXT
+++ b/release/ABOUT.TXT
@@ -1,42 +1,183 @@
-This file attempts to describe what you are seeing here.  Here is a typical
-distribution tree:
-
-HARDWARE.TXT    bin             dict            manpages        tools
-INSTALL.TXT     compat1x        des		doc             packages
-README.TXT      compat20        floppies        ports
-RELNOTES.TXT    compat21        games           proflibs
-XF8632          info            src
-
-The *.TXT files obviously contain documentation (README.TXT being a good
-start).  The XF8632 directory contains the XFree86 project's 3.2 release
-and consists of a series of gzip'd tar files which contain each component
+o About FreeBSD:
+
+What is FreeBSD?  FreeBSD is an operating system based on 4.4 BSD Lite
+for Intel, AMD, Cyrix or NexGen "x86" based PC hardware.  It works
+with a very wide variety of PC peripherals and configurations and can
+be used for everything from software development to Internet Service
+Provision.
+
+This release of FreeBSD contains everything you need to run such a
+system, including full source code for everything.  With the source
+distribution installed you can literally recompile the entire system
+from scratch with one command, making it ideal for students,
+researchers or folks who simply want to see how it all works.
+
+A large collection of 3rd party ported software (the "ports
+collection") is also provided to make it easier for you to obtain and
+install all your favorite traditional UNIX utilities for FreeBSD.
+Over 750 ports, from editors to programming languages to graphical
+applications, make FreeBSD a powerful and comprehensive operating
+environment that extends far beyond what's provided by many commercial
+versions of UNIX.
+
+For more documentation on this system it is recommended that you
+purchase the 4.4BSD Document Set from O'Reilly Associates and the
+USENIX Association, ISBN 1-56592-082-1.  We have no connection with
+O'Reilly, we're just satisfied customers!
+
+If you're new to FreeBSD then you should also read EVERYTHING listed
+in the Documentation menu on the boot floppy.  It may seem like a lot
+to read, but you should at least acquaint yourself with the types of
+information available should you later get stuck.  Once the system is
+installed, you can also revisit this menu and use a WEB browser to
+read the installed FAQ (Frequently Asked Questions) and Handbook HTML
+documentation sets for FreeBSD.  You can also use the browser to visit
+other WEB sites on the net (such as http://www.freebsd.org) if you
+have an Internet connection.
+
+
+DISCLAIMER: While FreeBSD does its best to safeguard against
+accidental loss of data, it's still more than possible to WIPE OUT
+YOUR ENTIRE DISK with this installation!  Please do not proceed to the
+final FreeBSD installation menu unless you've adequately backed up any
+important data first!  We really mean it!
+
+
+o E-mail addresses and tech support info:
+
+For general questions, please send email to :
+
+        questions@FreeBSD.org
+
+Please also have patience if your questions are not answered right
+away - this mailing list is staffed purely by volunteers and they also
+have real life schedules to contend with.  Questions which are asked
+intelligently (e.g. not "My system doesn't work!  What's wrong!?")
+also stand a far greater chance of being answered. If your question
+does not contain enough information to allow the responder to generate
+a meaningful answer, they generally won't.
+
+Bug reports submitted with the send-pr command are also logged and
+tracked in our bugs database, and you'll be kept informed of any
+changes in status during the life of the bug (or feature request).
+
+Technical comments on this release should be sent (in English!) to:
+
+        hackers@FreeBSD.org
+
+Bug reports should be sent using the `send-pr' command or the Web page
+at http://www.freebsd.org/send-pr.html.  If you cannot use either of
+these two methods, you may also send mail to:
+
+        bugs@FreeBSD.org
+
+
+PLEASE ALSO BE SURE TO INDICATE WHICH VERSION OF FREEBSD YOU'RE
+RUNNING IN ANY BUG REPORTS OR QUESTIONS!
+
+Sorry for the caps, but you'd be amazed at how many times people
+forget this and there are many different release versions of FreeBSD
+out there now.  It's imperative that we know what you're running so
+that we tell if you're suffering from a bug which has already been
+fixed.
+
+The core of FreeBSD does not contain DES code which would inhibit its
+being exported outside the United States.  There is an add-on package
+to the core distribution, for use only in the United States, that
+contains the programs that normally use DES.  The auxiliary packages
+provided separately can be used by anyone.  A freely (from outside the
+U.S.) exportable distribution of DES for our non-U.S. users also
+exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
+
+If password security for FreeBSD is all you need and you have no
+requirement for copying encrypted passwords from different hosts
+(Suns, DEC machines, etc) into FreeBSD password entries, then
+FreeBSD's MD5 based security may be all you require!  We feel that our
+default security model is more than a match for DES, and without any
+messy export issues to deal with.  If you're outside (or even inside)
+the U.S., give it a try!  This snapshot also includes support for
+mixed password files - either DES or MD5 passwords will be accepted,
+making it easier to transition from one scheme to the other.
+
+
+o WWW Resources:
+
+Our WEB site, http://www.freebsd.org, is also a very good source for
+updated information and provides a number of advanced documentation
+searching facilities.  If you wish to use Netscape as your browser,
+you may install the BSDI version from ftp://ftp.mcom.com or simply
+type:
+
+        # cd /usr/ports/www/netscape3
+        # make all install
+
+If you have the Ports collection installed on your machine (usually on
+the 2nd CDROM of a CDROM release).
+
+
+Several other non-commercial browsers are also available in
+/usr/ports/net and may be compiled and installed in the same fashion.
+Many are also available as pre-compiled packages - see the Packages
+entry in the Configuration menu for more details.
+
+The Handbook and FAQ are also available as on-line documents in
+/usr/share/doc and can be read using the ``file:/usr/share/doc''
+syntax in any HTML capable browser.
+
+
+o Distributions:
+
+A typical FreeBSD distribution directory looks like this:
+
+ABOUT.TXT       bin             dict            manpages        tools
+HARDWARE.TXT    compat1x        des		doc             packages
+INSTALL.TXT     compat20        floppies        ports
+README.TXT      compat21        games           proflibs
+RELNOTES.TXT    info            src
+XF8632
+
+If you want to do a CDROM, FTP or NFS installation from this
+distribution directory, all you need to do is make a 1.44Mb floppy
+from the floppies/boot.flp image file (see floppies/README.TXT for
+instructions on how to do this), boot it and follow the instructions.
+
+If you're trying to do some other type of installation, or are just
+curious about how the distribution is organized in general, what
+follows is a more thorough description of each item in more detail:
+
+The *.TXT files obviously contain documentation (ABOUT.TXT being what
+you're reading now).
+
+The XF8632 directory contains the XFree86 project's 3.2 release and
+consists of a series of gzip'd tar files which contain each component
 of the XFree86 distribution.
 
-The compat1x, compat20 and compat21 directories contain distributions for
-compatibility with older releases and are distributed as gzip'd tar files -
-they can be installed during release time or later by running their
-`install.sh' scripts.
+The bin, dict, des, doc, games, info, manpages, proflibs, and src
+directories contain the primary distribution components of FreeBSD
+itself and are split into smaller files for easy packing onto floppies
+(should that be necessary).
 
-The bin, dict, des, doc, games, info, manpages, proflibs, and src directories
-contain the primary distribution components of FreeBSD itself and are split
-into smaller files for easy packing onto floppies (should that be necessary).
+The compat1x, compat20 and compat21 directories contain distributions
+for compatibility with older releases and are distributed as single
+gzip'd tar files - they can be installed during release time or later
+by running their `install.sh' scripts.
 
-A typical distribution (we'll use the info distribution as an example) looks
-like this:
+A typical distribution (we'll use the info distribution as an example)
+looks like this:
 
 CHECKSUM.MD5    info.ab         info.ad         info.inf        install.sh
 info.aa         info.ac         info.ae         info.mtree
 
 The CHECKSUM.MD5 file contains MD5 signatures for each file, should
 data corruption be suspected, and is purely for reference - it is not
-used by the actual installation and does not need to be copied with the
-rest of the distribution files.  The info.a* files are split, gzip'd
-tar files, the contents of which can be viewed by doing:
+used by the actual installation and does not need to be copied with
+the rest of the distribution files.  The info.a* files are split,
+gzip'd tar files, the contents of which can be viewed by doing:
 
 	cat info.a* | tar tvzf -
 
-During installation, they are automatically concatenated and extracted by
-the installation procedure.
+During installation, they are automatically concatenated and extracted
+by the installation procedure.
 
 The info.inf file is also necessary since it is read by the installation
 program in order to figure out how many pieces to look for when fetching and
diff --git a/release/Makefile b/release/Makefile
index f30021b..fcf5054 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -46,8 +46,9 @@ ZIPNSPLIT=		gzip --no-name -9 -c | split -b 240640 -
 # Upper size for the mfs in the boot.flp kernel.
 # These are adjusted down to the minimum needed by doFS.sh.
 BOOTMFSSIZE=		1440
-MFSINODE=		80000
-FIXITINODE=		28000
+MFSINODE=		60000
+FIXITINODE=		20000
+BOOTINODE=		100000
 
 # Things which will get you into trouble if you change them
 DISTRIBUTIONS=		bin ${EXTRA_DISTS}
@@ -377,8 +378,7 @@ release.8: write_mfs_in_kernel dumpnlist
 	rm -rf ${RD}/mfsfd
 	mkdir ${RD}/mfsfd
 	cd ${RD}/mfsfd && \
-		mkdir -p etc dev mnt stand/help && \
-		ln -s 'AH<<<<' etc/malloc.conf
+		mkdir -p etc dev mnt stand/help
 	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
 		DIR=${RD}/mfsfd/stand ZIP=false
 	( cd ${RD}/trees/bin/dev && \
@@ -613,14 +613,13 @@ doMFSKERN:
 	kzip -v ${RD}/boot.${FSIMAGE}/kernel
 	@mv ${RD}/boot.${FSIMAGE}/kernel ${RD}/kernels/MFSKERNEL.${FSIMAGE}
 	@mv ${RD}/boot.${FSIMAGE}/kernel.kz ${RD}/boot.${FSIMAGE}/kernel
-	@ls -l ${RD}/boot.${FSIMAGE}/kernel
 	@rm -f ${RD}/floppies/boot${FSIMAGE}.flp
-	cat ${RD}/trees/bin/usr/mdec/rawboot ${RD}/boot.${FSIMAGE}/kernel | \
-		dd conv=sync of=${RD}/floppies/boot${FSIMAGE}.flp
-	@echo 'USERCONFIG' > startup_foo
-	@echo 'intro' >> startup_foo
-	dd if=startup_foo of=${RD}/floppies/boot${FSIMAGE}.flp \
-	  seek=1 bs=512 count=1 conv=notrunc
-	@rm -f startup_foo
+	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/boot.${FSIMAGE} \
+		${BOOTINODE} ${FDLABEL}
+	#echo 'USERCONFIG' > startup_foo
+	#echo 'intro' >> startup_foo
+	#dd if=startup_foo of=fs-image seek=1 bs=512 count=1 conv=notrunc
+	#rm -f startup_foo
+	mv fs-image ${RD}/floppies/boot${FSIMAGE}.flp
 
 .include <bsd.prog.mk>
diff --git a/release/doFS.sh b/release/doFS.sh
index d55c424..61195fd 100644
--- a/release/doFS.sh
+++ b/release/doFS.sh
@@ -34,11 +34,10 @@ do
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} fs-image
 
-	dd if=${RD}/trees/bin/usr/mdec/boot1 of=fs-image conv=notrunc
 	disklabel -Brw \
 		-b ${RD}/trees/bin/usr/mdec/fdboot \
 		-s ${RD}/trees/bin/usr/mdec/bootfd \
-		${VNDEVICE} auto
+		/dev/r${VNDEVICE} minimum
 
 	newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}c
 
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index d55c424..61195fd 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -34,11 +34,10 @@ do
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} fs-image
 
-	dd if=${RD}/trees/bin/usr/mdec/boot1 of=fs-image conv=notrunc
 	disklabel -Brw \
 		-b ${RD}/trees/bin/usr/mdec/fdboot \
 		-s ${RD}/trees/bin/usr/mdec/bootfd \
-		${VNDEVICE} auto
+		/dev/r${VNDEVICE} minimum
 
 	newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}c