Release FreeBSD 1.1upstream/1.1.0_cvsrelease/1.1.0_cvs

This commit was manufactured to restore the state of the 1.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

64 files changed, 2749 insertions, 512 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 444ef5eb411e..9b4b804c2471 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,5 @@
-#	@(#)Makefile	5.11 (Berkeley) 5/21/91
+#	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
+#	$Id: Makefile,v 1.53.2.5 1994/05/03 10:08:21 rgrimes Exp $
 
 NOOBJ=	noobj
 
@@ -25,60 +26,93 @@ WCS1=	wcs fppwcs poc poc1 poc2 fppoc
 WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
 
 # Special top level files for FreeBSD
-COPYRIGHT= COPYRIGHT
-FREEBSD= CONTRIB.386BSD CONTRIB.FreeBSD RELNOTES.FreeBSD ${COPYRIGHT}
+COPYRIGHT=	COPYRIGHT.386BSD COPYRIGHT.FreeBSD
+FREEBSD=	CONTRIB.386BSD CONTRIB.FreeBSD
+FREEBSD+=	MIRROR.SITES PERSONAL.ACKS RELNOTES.FreeBSD SUPPORT.TXT
+FREEBSD+=	${COPYRIGHT}
 #
 # Floppy drive name and files for building FreeBSD Floppies
 FLOPPY?=	fd0
 MOUNT?=		/mnt
-FLOPPY_TYPE?=	floppy5
+FLOPPY_TYPE?=	fd1200
 #
 MDEC=		usr/mdec/bootfd usr/mdec/fdboot
 MDEC+=		usr/mdec/bootsd usr/mdec/sdboot
 MDEC+=		usr/mdec/bootwd usr/mdec/wdboot
 #
-KC_DIRS=	dev mnt
+KC_DIRS=	bin dev mnt sbin
 KC_FILES=	${COPYRIGHT}
-KC_FILES+=	bin/[ bin/cp bin/echo bin/sh bin/test
-KC_FILES+=	sbin/fsck sbin/halt sbin/init sbin/mount sbin/umount
+KC_FILES+=	bin/sh					# XXX Crunch is broken!
+KC_FILES+=	sbin/mount sbin/mount_isofs		# XXX Crunch is broken!
+KC_LINKS=	bin/[ bin/cp bin/echo bin/test
+KC_LINKS+=	sbin/fsck sbin/halt sbin/init
+KC_LINKS+=	sbin/umount
 #
-FILESYSTEM_DIRS=	bin dev etc mnt sbin usr usr/bin usr/mdec usr/sbin
+CD_DIRS=	etc usr
+#
+FILESYSTEM_DIRS=	bin dev etc mnt proc sbin usr usr/bin usr/mdec usr/sbin
 FILESYSTEM_TREES=	dev
 FILESYSTEM_FILES=	${COPYRIGHT}
-FILESYSTEM_FILES+=	bin/[ bin/expr bin/ls bin/mkdir bin/rm
-FILESYSTEM_FILES+=	bin/sh bin/sync bin/test
+FILESYSTEM_FILES+=	bin/sh				# XXX Crunch is broken!
 FILESYSTEM_FILES+=	dev/MAKEDEV
 FILESYSTEM_FILES+=	etc/group
 FILESYSTEM_FILES+=	etc/master.passwd etc/passwd etc/pwd.db
-FILESYSTEM_FILES+=	sbin/disklabel sbin/halt sbin/init
-FILESYSTEM_FILES+=	sbin/mount sbin/mount_pcfs
-FILESYSTEM_FILES+=	sbin/newfs
-FILESYSTEM_FILES+=	sbin/umount
-FILESYSTEM_FILES+=	sbin/fdisk
-FILESYSTEM_FILES+=	usr/bin/cpio
 FILESYSTEM_FILES+=	${MDEC}
-FILESYSTEM_FILES+=	usr/sbin/bad144
+FILESYSTEM_LINKS=	bin/[ bin/expr bin/ls bin/mkdir bin/rm
+FILESYSTEM_LINKS+=	bin/sync bin/test
+FILESYSTEM_LINKS+=	sbin/disklabel sbin/fdisk sbin/halt sbin/init
+FILESYSTEM_LINKS+=	sbin/mount sbin/mount_pcfs
+FILESYSTEM_LINKS+=	sbin/newfs
+FILESYSTEM_LINKS+=	sbin/umount
+FILESYSTEM_LINKS+=	usr/bin/cpio
+FILESYSTEM_LINKS+=	usr/bin/gunzip usr/bin/gzcat usr/bin/gzip usr/bin/zcat
+FILESYSTEM_LINKS+=	usr/sbin/bad144
+FILESYSTEM_CPIO=	.profile
+FILESYSTEM_CPIO+=	root/.profile
+FILESYSTEM_CPIO+=	bin/[
+FILESYSTEM_CPIO+=	bin/chmod bin/cat bin/cp bin/df bin/expr bin/ls
+FILESYSTEM_CPIO+=	bin/ln bin/mkdir bin/mv bin/rm bin/sync
+FILESYSTEM_CPIO+=	bin/test
+FILESYSTEM_CPIO+=	etc/spwd.db
+FILESYSTEM_CPIO+=	sbin/disklabel sbin/fdisk sbin/halt sbin/init
+FILESYSTEM_CPIO+=	sbin/mount sbin/mount_pcfs
+FILESYSTEM_CPIO+=	sbin/newfs
+FILESYSTEM_CPIO+=	sbin/umount
+FILESYSTEM_CPIO_DIRS=	root
 
 CPIO_FILES=	${COPYRIGHT}
-CPIO_FILES+=	usr/bin/gunzip usr/bin/gzcat usr/bin/gzip usr/bin/zcat
-CPIO_CPIO=	bin/chmod bin/cat bin/cp bin/dd bin/df bin/mv bin/pwd bin/stty
-CPIO_CPIO+=	etc/protocols etc/remote etc/services etc/spwd.db
+CPIO_CPIO=	bin/dd bin/ps bin/pwd bin/stty
+CPIO_CPIO+=	etc/protocols etc/remote etc/services
+CPIO_CPIO+=	etc/termcap
+CPIO_CPIO+=	sbin/dmesg
 CPIO_CPIO+=	sbin/ifconfig sbin/fsck sbin/mknod sbin/mount_isofs
+CPIO_CPIO+=	sbin/mount_procfs
 CPIO_CPIO+=	sbin/reboot sbin/route sbin/slattach
-CPIO_CPIO+=	tmp
-CPIO_CPIO+=	usr/bin/awk usr/bin/chgrp usr/bin/ftp
+CPIO_CPIO+=	usr/bin/awk usr/bin/chgrp usr/bin/cpio usr/bin/ex usr/bin/ftp
+CPIO_CPIO+=	usr/bin/gunzip usr/bin/gzcat usr/bin/gzip
 CPIO_CPIO+=	usr/bin/more usr/bin/tar usr/bin/tip
-CPIO_CPIO+=	usr/bin/elvis usr/bin/ex usr/bin/vi usr/bin/view
-CPIO_CPIO+=	usr/sbin/update usr/sbin/chown
-CPIO_CPIO_DIRS=	var var/tmp var/run var/spool var/spool/lock
+CPIO_CPIO+=	usr/bin/vi usr/bin/view usr/bin/zcat
+CPIO_CPIO+=	usr/lib/libc.so.1.0
+CPIO_CPIO+=	usr/lib/libcurses.so.1.0
+CPIO_CPIO+=	usr/lib/libgcc.so.1.0
+CPIO_CPIO+=	usr/lib/libm.so.1.0
+CPIO_CPIO+=	usr/lib/libtermlib.so.1.0
+CPIO_CPIO+=	usr/lib/libtermcap.so.1.0
+CPIO_CPIO+=	usr/lib/libutil.so.1.0
+CPIO_CPIO+=	usr/libexec/ld.so
+CPIO_CPIO+=	usr/sbin/bad144 usr/sbin/chown
+CPIO_CPIO+=	usr/share/misc/termcap
+CPIO_CPIO_DIRS=		tmp usr/lib usr/libexec usr/share usr/share/misc
+CPIO_CPIO_DIRS+=	var var/tmp var/run var/spool var/spool/lock
 
 CRYPT_LIB=	lib/libcrypt
 CRYPT_SRCS=	bin/ed bin/rcp
 CRYPT_SRCS+=	libexec/ftpd libexec/makekey libexec/rexecd libexec/rlogind
 CRYPT_SRCS+=	libexec/rshd libexec/telnetd libexec/uucpd
+CRYPT_SRCS+=	sbin/init.bsdi
 CRYPT_SRCS+=	usr.bin/bdes usr.bin/lock usr.bin/login usr.bin/passwd
 CRYPT_SRCS+=	usr.bin/rlogin usr.bin/rsh usr.bin/su usr.bin/telnet
-CRYPT_DIRS=	bin usr usr/bin usr/lib usr/libexec 
+CRYPT_DIRS=	bin sbin usr usr/bin usr/lib usr/libexec 
 
 all clean cleandir depend etc install lint:
 
@@ -102,7 +136,7 @@ distribution: distrib-dirs
 	install -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc
 	install -c -o ${BINOWN} -g ${BINGRP} -m 666 ${BIN2} ${DESTDIR}/etc
 	install -c -o root -g wheel -m 755 ${BIN3} ${DESTDIR}/etc
-	install -c -o root -g wheel -m 600 crontab ${DESTDIR}/var/cron/tabs/root
+	install -c -o root -g wheel -m 644 crontab ${DESTDIR}/etc
 	install -c -o root -g wheel -m 600 /dev/null ${DESTDIR}/var/cron/log
 	install -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
 	pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
@@ -155,8 +189,9 @@ distribution: distrib-dirs
 	(cd ../usr.sbin/sendmail/src; \
 	    ${MAKE} install; \
 	 cd ../cf/cf; \
-	    ${MAKE} tcpproto.cf; \
-	    install -o root -g wheel -m 644 tcpproto.cf \
+	    ${MAKE} obj; \
+	    ${MAKE} freefall.cf; \
+	    install -o root -g wheel -m 644 obj/freefall.cf \
 	        ${DESTDIR}/etc/sendmail.cf)
 	(cd ../; \
 	    install -c -o root -g wheel -m 444 ${FREEBSD} ${DESTDIR}/)
@@ -188,9 +223,9 @@ kcopy-kernels: ../sys/i386/conf/GENERICAH ../sys/i386/conf/GENERICBT
 kcopy-floppy:
 	disklabel -w -r ${FLOPPY} ${FLOPPY_TYPE} \
 		/usr/mdec/fdboot /usr/mdec/bootfd
-	newfs -b 4096 -c 80 -f 512 -i 16384 -m 0 -o space \
-		r${FLOPPY}a ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY}a ${MOUNT}
+	newfs -b 4096 -c 80 -f 512 -i 10240 -m 0 -o space \
+		r${FLOPPY} ${FLOPPY_TYPE}
+	mount /dev/${FLOPPY} ${MOUNT}
 	chown root.wheel ${MOUNT}/.
 	chmod 755 ${MOUNT}/.
 	(cd ${DESTDIR}/; \
@@ -198,42 +233,90 @@ kcopy-floppy:
 	(cd ${MOUNT}/dev; \
 	    sh ${DESTDIR}/dev/MAKEDEV std; \
 	    rm -rf fd; \
-	    sh ${DESTDIR}/dev/MAKEDEV fd0 wd0 sd0 sd1)
+	    sh ${DESTDIR}/dev/MAKEDEV fd0 fd1 wd0 wd1 sd0 sd1; \
+	    rm -rf fd0?* rfd0?* fd1?* rfd1?*; \
+	    sh ${DESTDIR}/dev/MAKEDEV cd0 mcd0 mcd1; \
+	    rm -rf rmcd*)
 	(cd ${DESTDIR}/; \
 	    ls ${KC_FILES} | cpio -pdamuv ${MOUNT})
 	install -c -o root -g wheel -m 755 etc.i386/kc.profile \
 	    ${MOUNT}/.profile
+	install -c -o root -g wheel -m 755 ${RELEASEDIR}/distbin/kcopy \
+	    ${MOUNT}/bin/kcopy
+	(cd ${MOUNT}/; \
+	    for i in ${KC_LINKS}; do \
+		ln bin/kcopy $$i; \
+	    done)
 
-kcopy-ah-floppy:
+kcopy_ah.flp:
 	${MAKE} kcopy-floppy
 	(cd ../sys/compile/GENERICAH; \
 	    install -c -o root -g wheel -m 755 386bsd ${MOUNT}/)
 	df -ik ${MOUNT}
-	umount /dev/${FLOPPY}a
-	fsck /dev/r${FLOPPY}a
-	dd if=/dev/r${FLOPPY}a of=${RELEASEDIR}/floppies/kcopy-ah-floppy \
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/kcopy_ah.flp \
+		bs=15b count=160
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/kcopy_ah.flp \
+		>${RELEASEDIR}/floppies/kcopy_ah.flp.gz
+
+kcopy_bt.flp:
+	${MAKE} kcopy-floppy
+	(cd ../sys/compile/GENERICBT; \
+	    install -c -o root -g wheel -m 755 386bsd ${MOUNT}/)
+	df -ik ${MOUNT}
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/kcopy_bt.flp \
 		bs=15b count=160
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/kcopy-ah-floppy \
-		>${RELEASEDIR}/floppies/kcopy-ah-floppy.gz
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/kcopy_bt.flp \
+		>${RELEASEDIR}/floppies/kcopy_bt.flp.gz
 
-kcopy-bt-floppy:
+cdins-floppy:
 	${MAKE} kcopy-floppy
+	(cd ${DESTDIR}/; \
+	    ls -d ${CD_DIRS} | cpio -pdamuv ${MOUNT})
+	(cd ${MOUNT}/usr; \
+	    ln -s /cdrom/filesys/usr/libexec libexec; \
+	    ln -s /cdrom/filesys/usr/lib lib)
+	mkdir ${MOUNT}/cdrom
+	chown root.wheel ${MOUNT}/cdrom
+	chmod 755 ${MOUNT}/cdrom
+	install -c -o root -g wheel -m 755 etc.i386/cdinst1.profile \
+	    ${MOUNT}/.profile
+	install -c -o root -g wheel -m 755 etc.i386/cdinst1.install \
+	    ${MOUNT}/install
+	
+cdins_ah.flp:
+	${MAKE} cdins-floppy
+	(cd ../sys/compile/GENERICAH; \
+	    install -c -o root -g wheel -m 755 386bsd ${MOUNT}/)
+	df -ik ${MOUNT}
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/cdins_ah.flp \
+		bs=15b count=160
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cdins_ah.flp \
+		>${RELEASEDIR}/floppies/cdins_ah.flp.gz
+
+cdins_bt.flp:
+	${MAKE} cdins-floppy
 	(cd ../sys/compile/GENERICBT; \
 	    install -c -o root -g wheel -m 755 386bsd ${MOUNT}/)
 	df -ik ${MOUNT}
-	umount /dev/${FLOPPY}a
-	fsck /dev/r${FLOPPY}a
-	dd if=/dev/r${FLOPPY}a of=${RELEASEDIR}/floppies/kcopy-bt-floppy \
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/cdins_bt.flp \
 		bs=15b count=160
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/kcopy-bt-floppy \
-		>${RELEASEDIR}/floppies/kcopy-bt-floppy.gz
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cdins_bt.flp \
+		>${RELEASEDIR}/floppies/cdins_bt.flp.gz
 
-filesystem-floppy:
+filesyst.flp:
 	disklabel -w -r ${FLOPPY} ${FLOPPY_TYPE} \
 		/usr/mdec/fdboot /usr/mdec/bootfd
 	newfs -b 4096 -c 80 -f 512 -i 10240 -m 0 -o space \
-		r${FLOPPY}a ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY}a ${MOUNT}
+		r${FLOPPY}  ${FLOPPY_TYPE}
+	mount /dev/${FLOPPY}  ${MOUNT}
 	chown root.wheel ${MOUNT}/.
 	chmod 755 ${MOUNT}/.
 	(cd ${DESTDIR}/; \
@@ -241,164 +324,177 @@ filesystem-floppy:
 	(cd ${MOUNT}/dev; \
 	    sh ${DESTDIR}/dev/MAKEDEV std; \
 	    rm -rf fd; \
-	    sh ${DESTDIR}/dev/MAKEDEV fd0 fd1 wd0 sd0 sd1; \
-	    rm -f rfd1[b-z] fd1[b-z])
+	    sh ${DESTDIR}/dev/MAKEDEV fd0 fd1 wd0 wd1 sd0 sd1; \
+	    rm -f fd0?* fd1?* rfd0?* rfd1?*)
 	(cd ${DESTDIR}/; \
-	    ls ${FILESYSTEM_FILES} | cpio -pdamuv ${MOUNT})
+	    ls ${FILESYSTEM_FILES} | cpio -pdamuv ${MOUNT}; \
+	    (find ${FILESYSTEM_CPIO}; ls -d ${FILESYSTEM_CPIO_DIRS}) | \
+		cpio -H newc --block-size=16 -oav | \
+		gzip -9 >${MOUNT}/inst1.cpio.gz)
 	install -c -o root -g wheel -m 755 etc.i386/inst1.profile \
 	    ${MOUNT}/.profile
 	install -c -o root -g wheel -m 755 etc.i386/inst1.install \
 	    ${MOUNT}/install
+	install -c -o root -g wheel -m 755 ${RELEASEDIR}/distbin/filesystem \
+	    ${MOUNT}/bin/filesystem
+	(cd ${MOUNT}/; \
+	    for i in ${FILESYSTEM_LINKS}; do \
+		ln bin/filesystem $$i; \
+	    done)
 	(cd ${MOUNT}/; \
 	    ls ${FILESYSTEM_FILES} >/tmp/filelist; \
+	    ls ${FILESYSTEM_LINKS} >>/tmp/filelist; \
 	    ls -d ${FILESYSTEM_DIRS} >>/tmp/filelist; \
 	    find ${FILESYSTEM_TREES} >>/tmp/filelist; \
-	    sort -u /tmp/filelist >filelist; \
+	    sort -u -r /tmp/filelist >filelist; \
 	    rm /tmp/filelist)
 	df -ik ${MOUNT}
-	umount /dev/${FLOPPY}a
-	fsck /dev/r${FLOPPY}a
-	dd if=/dev/r${FLOPPY}a of=${RELEASEDIR}/floppies/filesystem-floppy \
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/filesyst.flp \
 		bs=15b count=160
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/filesystem-floppy \
-		>${RELEASEDIR}/floppies/filesystem-floppy.gz
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/filesyst.flp \
+		>${RELEASEDIR}/floppies/filesyst.flp.gz
 
-cpio-floppy:
+cpio.flp:
 	disklabel -w -r ${FLOPPY} ${FLOPPY_TYPE} \
 		/usr/mdec/fdboot /usr/mdec/bootfd
 	newfs -b 4096 -c 80 -f 512 -i 65536 -m 0 -o space \
-			r${FLOPPY}a ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY}a ${MOUNT}
+			r${FLOPPY}  ${FLOPPY_TYPE}
+	mount /dev/${FLOPPY} ${MOUNT}
 	chown root.wheel ${MOUNT}/.
 	chmod 755 ${MOUNT}/.
 	(cd ${DESTDIR}/; \
 		ls ${CPIO_FILES} | cpio -pdamuv ${MOUNT})
 	(cd ${DESTDIR}/; \
 	    (find ${CPIO_CPIO}; ls -d ${CPIO_CPIO_DIRS}) | \
-		cpio -oav | gzip -9 >${MOUNT}/inst2.cpio.gz)
-	install -c -o root -g wheel -m 755 etc.i386/inst2.profile \
-	    ${MOUNT}/.profile
-	install -c -o root -g wheel -m 755 etc.i386/inst2.install \
+		cpio -H newc --block-size=16 -oav | \
+		gzip -9 >${MOUNT}/inst2.cpio.gz)
+	install -c -o root -g wheel -m 755 etc.i386/cpio.rc \
+	    ${MOUNT}/rc
+	install -c -o root -g wheel -m 755 etc.i386/cpio.install \
 	    ${MOUNT}/install
+	install -c -o root -g wheel -m 755 etc.i386/cpio.magic \
+	    ${MOUNT}/magic
 	df -ik ${MOUNT}
-	umount /dev/${FLOPPY}a
-	fsck /dev/r${FLOPPY}a
-	dd if=/dev/r${FLOPPY}a of=${RELEASEDIR}/floppies/cpio-floppy \
+	umount /dev/${FLOPPY}
+	fsck /dev/r${FLOPPY}
+	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/cpio.flp \
 		bs=15b count=160
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cpio-floppy \
-		>${RELEASEDIR}/floppies/cpio-floppy.gz
+	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cpio.flp \
+		>${RELEASEDIR}/floppies/cpio.flp.gz
 
 bin-tarball:
 	(cd ${DESTDIR}; \
 		tar cf - . | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/bin_tgz.)
+		${RELEASEDIR}/tarballs/bindist/bin_tgz.)
 
 srcbase-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/[A-Z]* | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcbase_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/base.)
 
 srcbin-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/bin | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcbin_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/bin.)
 
 srccontrib-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/contrib | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srccontrib_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/contrib.)
 
 srcetc-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/etc | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcetc_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/etc.)
 
 srcgames-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/games | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcgames_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/games.)
 
 srcgnu-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/gnu | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcgnu_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/gnu.)
 
 srcinclude-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/include | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcinclude_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/include.)
 
 srclib-tarball:
 	(cd ${DESTDIR}; \
 		tar --exclude usr/src/${CRYPT_LIB} -cf - usr/src/lib | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srclib_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/lib.)
 
 srclibcrypt-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/${CRYPT_LIB} | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srclibcrypt_tgz.)
+		${RELEASEDIR}/tarballs/secrdist/libcrypt.)
 
 srclibexec-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/libexec | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srclibexec_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/libexec.)
 
 srcsbin-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/sbin | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcsbin_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/sbin.)
 
 srcshare-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/share | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcshare_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/share.)
 
 srcsys-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/sys | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcsys_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/sys.)
 
 srcusrbin-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/usr.bin | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcusrbin_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/usrbin.)
 
 srcusrsbin-tarball:
 	(cd ${DESTDIR}; \
 		tar -cf - usr/src/usr.sbin | \
 		gzip --no-name -9 -c | \
 		split -b 240640 - \
-		${RELEASEDIR}/tarballs/srcusrsbin_tgz.)
+		${RELEASEDIR}/tarballs/srcdist/usrsbin.)
 
 src-tarball: srcbase-tarball srcbin-tarball srccontrib-tarball srcetc-tarball \
 	srcgames-tarball srcgnu-tarball srcinclude-tarball srclib-tarball \
@@ -436,7 +532,7 @@ des-tarball:
 		tar cf - . | \
 			gzip --no-name -9 -c | \
 			split -b 240640 - \
-			${RELEASEDIR}/tarballs/des_tgz.)
+			${RELEASEDIR}/tarballs/secrdist/des_tgz.)
 	rm -rf ${RELEASEDIR}/tmpdes
 
 distrib-dirs:
@@ -448,21 +544,25 @@ distrib-dirs:
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 
-floppies: kcopy-ah-floppy kcopy-bt-floppy filesystem-floppy \
-	  cpio-floppy
+floppies:	kcopy_ah.flp kcopy_bt.flp filesyst.flp cpio.flp \
+		cdins_ah.flp cdins_bt.flp
 
-release: release-dirs distribution kcopy-kernels floppies \
-	 bin-tarball des-tarball
+release:	release-dirs distribution kcopy-kernels floppies \
+		bin-tarball des-tarball
 	
 release-dirs:
-	rm -rf ${RELEASEDIR}/filesystem
-	mkdir ${RELEASEDIR}/filesystem
-	chown root.wheel ${RELEASEDIR}/filesystem
-	chmod 755 ${RELEASEDIR}/filesystem
+	rm -rf ${RELEASEDIR}/filesys
+	mkdir ${RELEASEDIR}/filesys
+	chown root.wheel ${RELEASEDIR}/filesys
+	chmod 755 ${RELEASEDIR}/filesys
 	rm -rf ${RELEASEDIR}/tarballs
 	mkdir ${RELEASEDIR}/tarballs
-	chown root.wheel ${RELEASEDIR}/tarballs
-	chmod 755 ${RELEASEDIR}/tarballs
+	mkdir ${RELEASEDIR}/tarballs/bindist
+	mkdir ${RELEASEDIR}/tarballs/objdist
+	mkdir ${RELEASEDIR}/tarballs/secrdist
+	mkdir ${RELEASEDIR}/tarballs/srcdist
+	chown -R root.wheel ${RELEASEDIR}/tarballs
+	chmod -R 755 ${RELEASEDIR}/tarballs
 	rm -rf ${RELEASEDIR}/floppies
 	mkdir ${RELEASEDIR}/floppies
 	chown root.wheel ${RELEASEDIR}/floppies
diff --git a/etc/config/cleartmp b/etc/config/cleartmp
new file mode 100644
index 000000000000..d3b9d56d8df3
--- /dev/null
+++ b/etc/config/cleartmp
@@ -0,0 +1,4 @@
+# $Id: cleartmp,v 1.1 1993/11/11 23:59:54 wollman Exp $
+# This option determines whether the /tmp directory should be
+# automatically cleared on startup.  Default is on.
+on
diff --git a/etc/config/gated b/etc/config/gated
new file mode 100644
index 000000000000..18c8a318a82a
--- /dev/null
+++ b/etc/config/gated
@@ -0,0 +1,4 @@
+# $Id: gated,v 1.1 1993/11/11 23:59:55 wollman Exp $
+# This file determins whether Cornell's GateD should be automatically
+# started.  The default is off.
+off
diff --git a/etc/config/kerberos b/etc/config/kerberos
new file mode 100644
index 000000000000..84ce76ab2254
--- /dev/null
+++ b/etc/config/kerberos
@@ -0,0 +1,4 @@
+# $Id: kerberos,v 1.1 1993/11/11 23:59:56 wollman Exp $
+# This file determines whether the Kerberos server should be
+# automatically started.  The default is off.
+off
diff --git a/etc/config/mountd.flags b/etc/config/mountd.flags
new file mode 100644
index 000000000000..4c17c2f13fc9
--- /dev/null
+++ b/etc/config/mountd.flags
@@ -0,0 +1,3 @@
+# $Id: mountd.flags,v 1.1 1993/11/12 03:46:07 wollman Exp $
+# This file lists the flags passed to the NFS mount daemon `mountd' when
+# started at boot time.
diff --git a/etc/config/named b/etc/config/named
new file mode 100644
index 000000000000..dfdd21b5f9f7
--- /dev/null
+++ b/etc/config/named
@@ -0,0 +1,6 @@
+# $Id: named,v 1.1 1993/11/11 23:59:57 wollman Exp $
+# This file determines whether the name server should be started
+# automatically.  The default is off, but Internet-connected systems
+# should set it to `on' whenever possible.  (NB: it must be
+# configured.)
+off
diff --git a/etc/config/nfsclient b/etc/config/nfsclient
new file mode 100644
index 000000000000..767349861144
--- /dev/null
+++ b/etc/config/nfsclient
@@ -0,0 +1,4 @@
+# $Id: nfsclient,v 1.1 1993/11/12 03:46:10 wollman Exp $
+# This file determines whether the NFS client software is automatically
+# started at boot time.  The default is off.
+off
diff --git a/etc/config/nfsclient.flags b/etc/config/nfsclient.flags
new file mode 100644
index 000000000000..912427ca43ab
--- /dev/null
+++ b/etc/config/nfsclient.flags
@@ -0,0 +1,4 @@
+# $Id: nfsclient.flags,v 1.1 1993/11/12 03:46:11 wollman Exp $
+# This file lists options provided to the NFS I/O daemon `nfsiod', when
+# started at boot time.
+4
diff --git a/etc/config/nfsserver b/etc/config/nfsserver
new file mode 100644
index 000000000000..4d28bca3a831
--- /dev/null
+++ b/etc/config/nfsserver
@@ -0,0 +1,4 @@
+# $Id: nfsserver,v 1.1 1993/11/11 23:59:58 wollman Exp $
+# This file determines whether the NFS server is automatically started
+# at boot time.  The default is off.
+off
diff --git a/etc/config/nfsserver.flags b/etc/config/nfsserver.flags
new file mode 100644
index 000000000000..40963ae8ca88
--- /dev/null
+++ b/etc/config/nfsserver.flags
@@ -0,0 +1,4 @@
+# $Id: nfsserver.flags,v 1.1 1993/11/12 03:46:12 wollman Exp $
+# This file lists the flags passed to the NFS server `nfsd' when started
+# at boot time.
+-u 0,0,4 -t 0,0
diff --git a/etc/config/nisclient b/etc/config/nisclient
new file mode 100644
index 000000000000..69e853e5b40f
--- /dev/null
+++ b/etc/config/nisclient
@@ -0,0 +1,4 @@
+# $Id: nisclient,v 1.1 1993/11/12 03:46:13 wollman Exp $
+# This file determines whether the Yellow Pages/NIS client software
+# is automatically started at boot time.  The default is off.
+off
diff --git a/etc/config/nisserver b/etc/config/nisserver
new file mode 100644
index 000000000000..448aaaceff53
--- /dev/null
+++ b/etc/config/nisserver
@@ -0,0 +1,4 @@
+# $Id: nisserver,v 1.1 1993/11/12 03:46:14 wollman Exp $
+# This file determines whether the Yellow Pages/NIS server software
+# is automatically started at boot time.  The default is off.
+off
diff --git a/etc/config/quota b/etc/config/quota
new file mode 100644
index 000000000000..e8ac6c3208e4
--- /dev/null
+++ b/etc/config/quota
@@ -0,0 +1,5 @@
+# $Id: quota,v 1.1 1993/11/11 23:59:58 wollman Exp $
+# This file determines whether quotas are enabled upon system startup.
+# This option does not effect whether the kernel supports quotas.
+# The default is off.
+off
diff --git a/etc/config/routed b/etc/config/routed
new file mode 100644
index 000000000000..7b1f58ab1902
--- /dev/null
+++ b/etc/config/routed
@@ -0,0 +1,5 @@
+# $Id: routed,v 1.1 1993/11/11 23:59:59 wollman Exp $
+# This option determines whether routed is automatically started at
+# boot time.  It should probably be turned off, but for now the
+# default is on.
+on
diff --git a/etc/config/routed.flags b/etc/config/routed.flags
new file mode 100644
index 000000000000..5ff4708c4e6d
--- /dev/null
+++ b/etc/config/routed.flags
@@ -0,0 +1,3 @@
+# $Id: routed.flags,v 1.1 1993/11/12 00:00:00 wollman Exp $
+# This file gives the command-line flags passed to routed when it is started.
+-q
diff --git a/etc/config/rwhod b/etc/config/rwhod
new file mode 100644
index 000000000000..ed8cc4c8e8c6
--- /dev/null
+++ b/etc/config/rwhod
@@ -0,0 +1,4 @@
+# $Id: rwhod,v 1.1 1993/11/12 00:00:02 wollman Exp $
+# This file determins whether rwhod is automatically started at boot
+# time.  The default is off.
+off
diff --git a/etc/config/savecore b/etc/config/savecore
new file mode 100644
index 000000000000..083f2d8d44c2
--- /dev/null
+++ b/etc/config/savecore
@@ -0,0 +1,4 @@
+# $Id: savecore,v 1.1 1993/11/12 00:00:02 wollman Exp $
+# This file determines whether any attempt is made to save a crash
+# dump in /var/crash upon boot-up.  The default is on.
+on
diff --git a/etc/config/savecore.flags b/etc/config/savecore.flags
new file mode 100644
index 000000000000..0613f1e30986
--- /dev/null
+++ b/etc/config/savecore.flags
@@ -0,0 +1,3 @@
+# $Id: savecore.flags,v 1.1 1993/11/12 03:46:15 wollman Exp $
+# This file determines where crash dumps will be saved.
+/var/crash
diff --git a/etc/config/sendmail b/etc/config/sendmail
new file mode 100644
index 000000000000..6890618d9709
--- /dev/null
+++ b/etc/config/sendmail
@@ -0,0 +1,4 @@
+# $Id: sendmail,v 1.1 1993/11/12 00:00:03 wollman Exp $
+# This file determines whether to automatically start sendmail at
+# system boot time.  The default is on; options in sendmail.flags.
+on
diff --git a/etc/config/sendmail.flags b/etc/config/sendmail.flags
new file mode 100644
index 000000000000..ded5828d5faa
--- /dev/null
+++ b/etc/config/sendmail.flags
@@ -0,0 +1,3 @@
+# $Id: sendmail.flags,v 1.1 1993/11/12 00:00:05 wollman Exp $
+# This file gives the flags passed to sendmail on system startup if enabled.
+-bd -q30m
diff --git a/etc/config/timed b/etc/config/timed
new file mode 100644
index 000000000000..12eedc25eb6d
--- /dev/null
+++ b/etc/config/timed
@@ -0,0 +1,4 @@
+# $Id: timed,v 1.1 1993/11/12 00:00:05 wollman Exp $
+# This file determines whether the Berkeley time daemon is
+# automatically started at boot time.  The default is off.
+off
diff --git a/etc/config/timed.flags b/etc/config/timed.flags
new file mode 100644
index 000000000000..cab985cb0a3d
--- /dev/null
+++ b/etc/config/timed.flags
@@ -0,0 +1,2 @@
+# $Id: timed.flags,v 1.1 1993/11/12 00:00:06 wollman Exp $
+# This file contains the flags passed to timed at start-up time, if enabled.
diff --git a/etc/crontab b/etc/crontab
index bec112a825d8..a68a42083960 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,20 +1,25 @@
-# /var/cron/tabs/root - root's crontab for FreeBSD
+# /etc/crontab - root's crontab for FreeBSD
 #
-# $Id: crontab,v 1.2 1993/07/19 19:08:04 rgrimes Exp $
+# $Id: crontab,v 1.5.2.1 1994/04/15 17:46:56 sean Exp $
 # From: Id: crontab,v 1.6 1993/05/31 02:03:57 cgd Exp
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
 HOME=/var/log
 #
-#minute	hour	mday	month	wday	command
+#minute	hour	mday	month	wday	who	command
 #
-#0/15	*	*	*	*	/usr/libexec/atrun
+*/5     *       *       *       *       root	/usr/libexec/atrun
 #
 # rotate log files every hour, if necessary
-#0	*	*	*	*	/usr/bin/newsyslog
+#0	*	*	*	*	root	/usr/bin/newsyslog
 #
 # do daily/weekly/monthly maintenance
-0	2	*	*	*	/etc/daily
-30	3	*	*	6	/etc/weekly
-30	5	1	*	*	/etc/monthly
+0	2	*	*	*	root	/etc/daily
+30	3	*	*	6	root	/etc/weekly
+30	5	1	*	*	root	/etc/monthly
+#
+# time zone change adjustment for wall cmos clock,
+# does nothing, if you have UTC cmos clock.
+# See adjkerntz(8) for details.
+0       3       *       *       *       root	/sbin/adjkerntz -a
diff --git a/etc/csh.login b/etc/csh.login
index 493a1bbfe233..040ba69f2d1e 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -2,3 +2,6 @@
 # Uncomment this to give you the default 4.2 behavior, where disk 
 # information is shown in K-Blocks
 # setenv BLOCKSIZE	K
+# Uncomment this, if you want to have 8-bit clean 'tcsh'
+# (temporary solution until proper locale will be available)
+# setenv LANG ru
diff --git a/etc/daily b/etc/daily
index bddf22f42a86..c14b0eac9269 100644
--- a/etc/daily
+++ b/etc/daily
@@ -41,10 +41,14 @@ if [ -d /var/rwho ] ; then
 fi
 
 cd /tmp
-find / ! -fstype local -a -prune -o \
-	\( -name '[#,]*' -o -name '.#*' -o -name a.out -o -name core \
-	   -o -name '*.CKP' -o -name '.emacs_[0-9]*' \) \
-		-a -atime +3 -exec rm -f -- {} \;
+# This is not safe, you need to decide what is appropriate for your
+# system.
+#
+#find / ! -fstype local -a -prune -o \
+#	\( -name '[#,]*' -o -name '.#*' -o -name a.out -o -name core \
+#	   -o -name '*.CKP' -o -name '.emacs_[0-9]*' \) \
+#		-a -atime +3 -exec rm -f -- {} \;
+#
 msgs -c
 if [ -f /etc/news.expire ]; then
 	/etc/news.expire
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index d6f16f884956..9433a69698e5 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -30,12 +30,15 @@
 #	wt*	QIC-interfaced (e.g. not SCSI) 3M cartridge tape
 #	st*	"NEW type scsi tapes" (old driver uses the
 #		block devices of the disks to get access)
+#	ft*	QIC-40/QIC-80 3M cartridge tape (interfaced
+#		via the floppy disk controller)
 #
 # Disks:
 #	wd*	"winchester" disk drives (ST506,IDE,ESDI,RLL,...)
 #	fd*	"floppy" disk drives (3 1/2", 5 1/4")
 #	sd*	"scsi disks"
-#	cd*	"cdrom disks"
+#	cd*	"scsi cdrom disks"
+#	mcd*	"mitsumi cdrom disks"
 #
 # Console ports:
 #	pc*	devices for stock pccons
@@ -46,9 +49,14 @@
 #	psm*	PS/2 mouse
 #
 # Terminal ports:
+#       ttyd*   dialin ports
+#       cua*    dialout ports
+#       tty*    hardwired terminals
 #	com*	standard PC COM ports (really makes tty* entries for com)
-#	sio*	fast interrupt PC COM ports (really makes tty* entries for sio)
-#	tty*	alias for sio ports, this is what the system really wants
+#		Note that the `com' driver is not configured in the 
+#		supplied kernels and is usually not what you want.  In
+#		a future release it may be completely desupported.  Fair
+#		warning.
 #
 # Pseudo terminals:
 #	pty*	set of 16 master and slave pseudo terminals
@@ -67,7 +75,7 @@
 #	tw*	xten power controller
 #	snd*	various sound cards
 #
-#	$Id: MAKEDEV,v 1.13 1993/10/23 22:24:35 jkh Exp $
+#	$Id: MAKEDEV,v 1.28.2.1 1994/03/07 00:58:43 rgrimes Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:
@@ -78,15 +86,15 @@ case $i in
 
 all)
 	sh MAKEDEV std						# standard
-	sh MAKEDEV wd0 wd1 fd0 fd1 wt0 sd0 sd1 st0 cd0		# bdev
-	sh MAKEDEV pty0 tty0 tty1 tty2 tty3 pc0 lpt0 lpt1 lpt2	# cdev
+	sh MAKEDEV wd0 wd1 fd0 fd1 ft0 wt0 sd0 sd1 st0 cd0 mcd0	# bdev
+	sh MAKEDEV pty0 tty0 tty1 pc0 lpt0 lpt1 lpt2            # cdev
 	sh MAKEDEV ch0 tw0 bpf0 dcf0 lpa0 lpa1 lpa2		# cdev
-	sh MAKEDEV speaker mse0 sio0 sio1 sio2 sio3		# cdev
+	sh MAKEDEV speaker mse0 ttyd2 ttyd3                     # cdev
 	# NOTE: co0 and vty04 are not done by a "sh MAKEDEV all"
 	# these are for codrv and interfere with other devices! - rgrimes
 	;;
 std)
-	rm -f console drum mem kmem null tty klog stdin stdout stderr
+	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
 	mknod console	c 0 0;	chmod 600 console;	chown root.wheel console
 	mknod drum	c 4 0;	chmod 640 drum;		chown root.kmem drum
 	mknod kmem	c 2 1;	chmod 640 kmem;		chown root.kmem kmem
@@ -114,21 +122,134 @@ std)
 wt*)
 	umask 2 ; u=`expr $i : '..\(.*\)'`
 	if [ x$u = x ]; then u=0; fi
-	rm -f rwt$u nrwt$u rwt${u}a nrwt${u}a rwt${u}b nrwt${u}b
-	mknod rwt${u}   c 10 `expr  0 + $u`     # 150 megabytes
+	rm -f r[Ww]t$u nr[Ww]t$u r[Ww]t$u[a-f] nr[Ww]t$u[a-f]
+	mknod rwt${u}   c 10 `expr  0 + $u`	# default density, 512b blocks
 	mknod nrwt${u}  c 10 `expr  4 + $u`
-	mknod rwt${u}a  c 10 `expr  8 + $u`     # 120 megabytes
-	mknod nrwt${u}a c 10 `expr 12 + $u`
-	mknod rwt${u}b  c 10 `expr 16 + $u`     # 60 megabytes
+#	mknod rWt${u}   c 10 `expr 64 + $u`	# default density, 1024b blocks
+#	mknod nrWt${u}  c 10 `expr 68 + $u`
+	mknod rwt${u}b  c 10 `expr 16 + $u`	# 60 megabytes
 	mknod nrwt${u}b c 10 `expr 20 + $u`
-	chown root.operator rwt$u nrwt$u rwt${u}a nrwt${u}a rwt${u}b nrwt${u}b
-	umask 77;
+	mknod rwt${u}c  c 10 `expr 24 + $u`     # 120 megabytes
+	mknod nrwt${u}c c 10 `expr 28 + $u`
+	mknod rwt${u}d  c 10 `expr 32 + $u`	# 150 megabytes
+	mknod nrwt${u}d c 10 `expr 36 + $u`
+#	mknod rwt${u}e  c 10 `expr 40 + $u`	# 300 megabytes?
+#	mknod nrwt${u}e c 10 `expr 44 + $u`
+#	mknod rwt${u}f  c 10 `expr 48 + $u`	# 600 megabytes?
+#	mknod nrwt${u}f c 10 `expr 52 + $u`
+	chown root.operator r[Ww]t$u nr[Ww]t$u r[Ww]t$u[a-f] nr[Ww]t$u[a-f]
+	umask 77
+	;;
+
+fd*)
+	umask 2 ; unit=`expr $i : '..\(.*\)'`
+	name=fd; blk=2; chr=9;
+	rm -f $name$unit* r$name$unit*
+	case $unit in
+	0|1|2|3)
+		mknod ${name}${unit}   b $blk `expr $unit '*' 64`
+		mknod r${name}${unit}  c $chr `expr $unit '*' 64`
+		# Fake BSD partitions
+		for i in a b c d e f g h
+		do
+			ln ${name}${unit} ${name}${unit}$i
+			ln r${name}${unit} r${name}${unit}$i
+		done
+		# User-readable and programmer-readable name sets
+
+		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
+		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
+		# ln ${name}${unit}.1720 ${name}${unit}135hs21
+		# ln r${name}${unit}.1720 r${name}${unit}135hs21
+
+		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
+		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
+		# ln ${name}${unit}.1480 ${name}${unit}135hs18
+		# ln r${name}${unit}.1480 r${name}${unit}135hs18
+		# ln ${name}${unit}.1480 ${name}${unit}96hs18
+		# ln r${name}${unit}.1480 r${name}${unit}96hs18
+
+		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
+		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
+		# ln ${name}${unit}.1440 ${name}${unit}135
+		# ln r${name}${unit}.1440 r${name}${unit}135
+		# ln ${name}${unit}.1440 ${name}${unit}135ds18
+		# ln r${name}${unit}.1440 r${name}${unit}135ds18
+		# ln ${name}${unit}.1440 ${name}${unit}96ds18
+		# ln r${name}${unit}.1440 r${name}${unit}96ds18
+
+		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
+		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
+		# ln ${name}${unit}.1200 ${name}${unit}96
+		# ln r${name}${unit}.1200 r${name}${unit}96
+		# ln ${name}${unit}.1200 ${name}${unit}96ds15
+		# ln r${name}${unit}.1200 r${name}${unit}96ds15
+		# ln ${name}${unit}.1200 ${name}${unit}135ds15
+		# ln r${name}${unit}.1200 r${name}${unit}135ds15
+
+		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
+		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
+		# ln ${name}${unit}.820 ${name}${unit}96hs10
+		# ln r${name}${unit}.820 r${name}${unit}96hs10
+		# ln ${name}${unit}.820 ${name}${unit}135hs10
+		# ln r${name}${unit}.820 r${name}${unit}135hs10
+
+		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
+		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
+		# ln ${name}${unit}.800 ${name}${unit}96ds10
+		# ln r${name}${unit}.800 r${name}${unit}96ds10
+		# ln ${name}${unit}.800 ${name}${unit}135ds10
+		# ln r${name}${unit}.800 r${name}${unit}135ds10
+
+		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
+		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
+		# ln ${name}${unit}.720 ${name}${unit}96ds9
+		# ln r${name}${unit}.720 r${name}${unit}96ds9
+		# ln ${name}${unit}.720 ${name}${unit}135ds9
+		# ln r${name}${unit}.720 r${name}${unit}135ds9
+
+		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
+		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
+		# ln ${name}${unit}.360 ${name}${unit}48
+		# ln r${name}${unit}.360 r${name}${unit}48
+		# ln ${name}${unit}.360 ${name}${unit}48ds9
+		# ln r${name}${unit}.360 r${name}${unit}48ds9
+
+		chgrp operator ${name}${unit}* r${name}${unit}*
+		chmod 640 ${name}${unit}* r${name}${unit}*
+		;;
+	*)
+		echo bad unit for disk in: $i
+		;;
+	esac
+	umask 77
+	;;
+
+
+ft*)
+	umask 2 ; unit=`expr $i : '..\(.*\)'`
+	name=ft; blk=2; chr=9;
+	rm -f $name$unit* r$name$unit*
+	case $unit in
+	0|1|2|3)
+		mknod ${name}${unit}   b $blk `expr $unit '*' 64 + 32`
+		mknod r${name}${unit}  c $chr `expr $unit '*' 64 + 32`
+		ln ${name}${unit} ${name}${unit}a
+		ln r${name}${unit} r${name}${unit}a
+		chgrp operator ${name}${unit}* r${name}${unit}*
+		chmod 640 ${name}${unit}* r${name}${unit}*
+		;;
+	*)
+		echo bad unit for tape in: $i
+		;;
+	esac
+	umask 77
 	;;
 
-fd*|sd*|wd*)
+
+sd*|wd*)
 	umask 2 ; unit=`expr $i : '..\(.*\)'`
 	case $i in
-	fd*) name=fd; blk=2; chr=9;;
 	sd*) name=sd; blk=4; chr=13;;
 	wd*) name=wd; blk=0; chr=3;;
 	esac
@@ -161,6 +282,12 @@ fd*|sd*|wd*)
 	umask 77
 	;;
 
+uk*)
+	unit=`expr $i : 'uk\(.*\)'`
+	rm -f uk$unit
+	mknod uk$unit c 27 $unit
+	;;
+
 com*)
 	unit=`expr $i : '...\(.*\)'`
 	rm -f tty0$unit
@@ -188,58 +315,47 @@ pty*)
 					rm -f pty%s%x; mknod pty%s%x c 6 %d; ", \
 					n, i, n, i, b+i, n, i, n, i, b+i); }'`
 		umask 77
-		if [ $class = 1 ]; then
-			mv ttyqf ttyv0; mv ptyqf ptyv0
-		fi
 		;;
 	esac
 	;;
 
 st*)
 	umask 2 ; unit=`expr $i : '..\(.*\)'`
-	case $i in
-	st*) name=st;  chr=14;;
-	esac
-	rm -f r$name$unit nr$name$unit er$name$unit enr$name$unit 
-	rm -f hr$name$unit hnr$name$unit her$name$unit henr$name$unit 
-	rm -f mr$name$unit mnr$name$unit mer$name$unit menr$name$unit 
-	rm -f lr$name$unit lnr$name$unit ler$name$unit lenr$name$unit 
+	chr=14;
+
+	#remove old stype names
+	rm -f [hml]rst[0123456] [hml][en]rst[0123456] [hml]enrst[0123456]  
+	#remove new style names
+	rm -f rst${unit} [en]rst${unit} enrst${unit}  
+	rm -f rst${unit}.[0123] nrst${unit}.[0123]\
+		 erst${unit}.[0123] st${unit}ctl.[0123]
+
 	case $unit in
 	0|1|2|3|4|5|6)
-		mknod r${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
-		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
-		mknod hr${name}${unit}	c $chr `expr $unit '*' 16 + 4`
-		mknod hnr${name}${unit}	c $chr `expr $unit '*' 16 + 5`
-		mknod her${name}${unit}	c $chr `expr $unit '*' 16 + 6`
-		mknod mr${name}${unit}	c $chr `expr $unit '*' 16 + 8`
-		mknod mnr${name}${unit}	c $chr `expr $unit '*' 16 + 9`
-		mknod mer${name}${unit}	c $chr `expr $unit '*' 16 + 10`
-		mknod lr${name}${unit}	c $chr `expr $unit '*' 16 + 12`
-		mknod lnr${name}${unit}	c $chr `expr $unit '*' 16 + 13`
-		mknod ler${name}${unit}	c $chr `expr $unit '*' 16 + 14`
-		chgrp operator r${name}${unit} nr${name}${unit} \
-			er${name}${unit}  
-		chgrp operator hr${name}${unit} hnr${name}${unit} \
-			her${name}${unit}  
-		chgrp operator mr${name}${unit} mnr${name}${unit} \
-			mer${name}${unit}  
-		chgrp operator lr${name}${unit} lnr${name}${unit} \
-			ler${name}${unit}  
-		chmod 640 r${name}${unit} nr${name}${unit} \
-			er${name}${unit} 
-		chmod 640 hr${name}${unit} hnr${name}${unit} \
-			her${name}${unit} 
-		chmod 640 mr${name}${unit} mnr${name}${unit} \
-			mer${name}${unit} 
-		chmod 640 lr${name}${unit} lnr${name}${unit} \
-			ler${name}${unit} 
+		for mode in 0 1 2 3
+		do
+			mknod rst${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 0`
+			mknod nrst${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 1`
+			mknod erst${unit}.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 2`
+			mknod st${unit}ctl.${mode} c $chr `expr $unit '*' 16 + $mode '*' 4 + 3`
+			chgrp operator 	rst${unit}.${mode}\
+					nrst${unit}.${mode} \
+					erst${unit}.${mode} \
+					st${unit}ctl.${mode}
+			chmod 644 	rst${unit}.${mode}\
+					nrst${unit}.${mode} \
+					erst${unit}.${mode} 
+			chmod 660	st${unit}ctl.${mode}
+		done
+		ln rst${unit}.0 rst${unit}
+		ln nrst${unit}.0 nrst${unit}
+		ln erst${unit}.0 erst${unit}
 		;;
 	*)
 		echo bad unit for tape in: $i
-		;;
-	esac
-	umask 77
+  		;;
+  	esac
+  	umask 77
 	;;
 
 ch*)
@@ -261,10 +377,11 @@ ch*)
 	umask 77
 	;;
 
-cd*)
-	umask 2 ; unit=`expr $i : '..\(.*\)'`
+cd*|mcd*)
+	umask 2 ;
 	case $i in
-	cd*) name=cd; blk=6; chr=15;;
+	cd*) unit=`expr $i : '..\(.*\)'`; name=cd; blk=6; chr=15;;
+	mcd*) unit=`expr $i : '...\(.*\)'`; name=mcd; blk=7; chr=29;;
 	esac
 	rm -f $name$unit? r$name$unit?
 	case $unit in
@@ -302,10 +419,11 @@ tw*)
 pc*)
 	chr=12
 	minor=0
- 	name=vga
-	rm -f ${name} kbd kbdco vgaco ttyv[0-9][0-9]
+ 	name=ttyv0
+	rm -f ${name} vga kbd kbdco vgaco ttyv[0-9][0-9]
 	mknod ${name} c ${chr} ${minor}
 	chown root.wheel $name
+	ln -s ${name} vga
 	;;
 
 # Use this to create virtual consoles for syscons, pcvt or codrv
@@ -351,11 +469,20 @@ speaker)
 	chown root.wheel speaker
 	;;
 
-sio*|tty*)
-	unit=`expr $i : '...\(.*\)'`
-	rm -f tty0$unit
+cua*|ttyd*)
+	unit=`expr $i : '...d*\(.\)'`
+	rm -f tty0$unit cua0$unit ttyd$unit
+	mknod ttyd$unit c 28 $unit
+	mknod cua0$unit c 28 `expr $unit + 128`
+	chown uucp.wheel ttyd$unit cua0$unit
+	;;
+
+tty*)
+	unit=`expr $i : 'tty\(.\)'`
+	rm -f tty0$unit cua0$unit ttyd$unit
+	umask 0
 	mknod tty0$unit c 28 $unit
-	chown uucp.wheel tty0$unit
+	umask 77
 	;;
 
 mse*)
diff --git a/etc/etc.i386/cdinst1.install b/etc/etc.i386/cdinst1.install
new file mode 100644
index 000000000000..f60f833f4e05
--- /dev/null
+++ b/etc/etc.i386/cdinst1.install
@@ -0,0 +1,1040 @@
+#!/bin/sh
+#	cd install floppy disk /install script
+#
+#	$Id: cdinst1.install,v 1.1.2.3 1994/05/05 04:11:20 rgrimes Exp $
+
+# ${OPSYSTEM}, the mounting of the cdrom drive, and the path are all
+# setup by .profile
+#
+OPSYSID=165
+ROOTMIN=7
+SWAPMIN=8
+USRMIN=45
+DISKMIN=`expr $ROOTMIN + $SWAPMIN + $USRMIN + 1`
+DEFBLOCKING=2
+DEFSECT=17
+DEFHEAD=12
+DEFCYLN=1024
+RUN_FDISK=""
+
+DOS1_ID=1
+DOS2_ID=4
+DOS3_ID=6
+
+set_arbitrary_defaults() {
+cyls_per_disk=$DEFCYLN
+tracks_per_cyl=$DEFHEAD
+sects_per_track=$DEFSECT
+unused_last_part=3
+part_cnt=4
+}
+
+
+get_fdisk_data() {
+cyls_per_disk=
+part_id=
+got_sysid=
+part_cnt=0
+sysid_cnt=0
+have_opsys_part=
+have_dos_part=
+unused_last_part=
+extent_max=0
+extent_max_part=
+
+fdisk /dev/r${drivename}d >fdisk.out 2>fdisk.err
+if [ $? -gt 0 ]; then
+	echo "Can't open /dev/r${drivename}d for reading!"
+	set_arbitrary_defaults
+	>fdisk.out
+	>fdisk.err
+	return 2
+elif [ -s fdisk.err ]; then
+	echo "Disk doesn't appear to be initialized..."
+	>fdisk.out
+	>fdisk.err
+	no_part_table=1
+fi
+while read data; do
+	if [ ! "$cyls_per_disk" ]; then
+		cyls_per_disk=`expr "$data" : '[^=]*=\([0-9]*\)'`
+		tracks_per_cyl=`expr "$data" : '[^=]*=[^=]*=\([0-9]*\)'`
+		sects_per_track=`expr "$data" : '[^=]*=[^=]*=[^=]*=\([0-9]*\)'`
+		continue
+	fi
+	if [ "$got_sysid" ]; then
+		start_part=`expr "$data" : '[^0-9]*\([0-9]*\)'`
+		size_part=`expr "$data" : '[^0-9]*[0-9]*[^0-9]*\([0-9]*\)'`
+		extent_part=`expr $start_part + $size_part`
+		if [ $extent_part -gt $extent_max ]; then
+			extent_max=$extent_part
+			extent_max_part=$part_id
+		fi
+		eval start${part_id}=$start_part
+		eval size${part_id}=$size_part
+		sysid_cnt=`expr $sysid_cnt + 1`
+		got_sysid=
+		part_id=
+	elif [  "$part_id" ]; then
+		sysid=`expr "$data" : 'sysid \([0-9]*\)'`
+		sysname=`expr "$data" : 'sysid[^(]*(\([^)]*\)'`
+		if [ "$no_part_table" -o "$sysid" = "0" -o \
+		    "$(expr "$data" : '\(<UNUSED>\)')" = "<UNUSED>" ]; then
+			unused_last_part=$part_id
+			part_id=
+			continue
+		fi
+		if [ "$sysid" = "$OPSYSID" ]; then
+			have_opsys_part=$part_id
+		elif [ ! "$have_dos_part" -a \( "$sysid" = "$DOS1_ID" -o \
+		    "$sysid" = "$DOS2_ID" -o "$sysid" = "$DOS3_ID" \) ]; then
+			have_dos_part=$part_id
+		fi
+		eval sysid${part_id}=$sysid
+		eval sysname${part_id}=\"$sysname\"
+		got_sysid=1
+	else 
+		part_id=`expr "$data" : 'The data[^0-9]*\([0-9]*\)'`
+		beg_cyl=`expr "$data" : '[ 	]*beg[^0-9]*\([0-9]*\)'`
+		end_cyl=`expr "$data" : '[ 	]*end[^0-9]*\([0-9]*\)'`
+		if [ "$part_id" ]; then 	
+			part_cnt=`expr $part_cnt + 1`
+		elif [ "${beg_cyl}" -gt "${cyls_per_disk}" -o  \
+		    "${end_cyl}" -gt "${cyls_per_disk}" ]; then
+			no_part_table=1
+			sysid_cnt=0
+			have_opsys_part=0
+			unused_last_part=`expr $part_cnt - 1`
+		fi
+	fi
+done <fdisk.out
+if [ ! "$cyls_per_disk" ]; then
+	set_arbitrary_defaults
+	return 2
+fi
+>fdisk.out
+>fdisk.err
+return 0
+}
+
+set_existing_part() {
+# Set existing partiton values as default (adjusting to cylinder boundaries)
+eval opsys_size=\$size${opsys_part}
+eval opsys_start=\$start${opsys_part}
+[ $opsys_size -eq 50000 ] && opsys_size=$disksize
+opsys_off=`expr $opsys_start / $cylindersize`
+opsys_adjusted=`expr $opsys_off \* $cylindersize`
+if [ $opsys_adjusted -lt $opsys_start -o $opsys_off -eq 0 ]; then
+	opsys_off=`expr $opsys_off + 1`
+	opsys_adjusted=`expr $opsys_off \* $cylindersize`
+	opsys_size=`expr $opsys_size - $opsys_adjusted + $opsys_start`
+fi
+cyls_per_opsys=`expr $opsys_size / $cylindersize`
+RUN_FDISK="fdisk -u"
+}
+
+
+set_overwrite_part() {
+while :; do
+	echo
+	echo -n "Please specify partition to overwrite: [3] "
+	read resp junk
+	opsys_part=${resp:-3}
+	if [ "$opsys_part" -ge 0 -a "$opsys_part" -le 3 ]; then
+		break
+	else
+		echo
+		echo "Partition must be in the range [0-3]"
+	fi
+done
+set_existing_part
+}
+
+analyze_fdisk_data() {
+if [ "$part_cnt" -gt 0 ]; then
+	echo
+	echo "Partition	Offset*	Size*	Name"
+	echo "---------	------	----	----"
+	i=0
+	while [ $i -lt $part_cnt ]; do
+		pcyls=
+		poff=
+		eval psize=\$size${i}
+		eval pstart=\$start${i}
+		eval pname=\$sysname${i}
+		[ "$psize" -eq 50000 ] && psize=$disksize
+		if [ "$psize" ]; then
+			poff=`expr $pstart / $cylindersize`
+			padjusted=`expr $poff \* $cylindersize`
+			if [ "$padjusted" -lt "$pstart" ]; then
+				poff=`expr $poff + 1`
+				padjusted=`expr $poff \* $cylindersize`
+				psize=`expr $psize - $padjusted + $pstart`
+			fi
+			pcyls=`expr $psize / $cylindersize`
+		fi
+		echo -n "${i}"
+		echo -n "		${poff:-0}"
+		echo -n "	${pcyls:-0}"
+		echo "	${pname:-(Unused)}"
+		i=`expr $i + 1`
+	done
+	echo "* Sizes and offsets are in units of cylinders."
+fi
+# Case I: >1024 cylinders
+force_offset=
+if [ $cyls_per_disk -gt 1024 ]; then
+	echo
+	echo "	WARNING: >1024 cylinders.  On some hardware, this prevents"
+	echo "	${OPSYSTEM} from sharing the disk with other operating systems."
+	echo -n "Install ${OPSYSTEM} on entire disk, overwriting existing partitions? [n] "
+	read resp junk
+	case "$resp" in
+	y*|Y*)
+		RUN_FDISK=""
+		force_offset=1
+		opsys_off=0
+		cyls_per_opsys=${cyls_per_disk}
+		opsys_part=${unused_last_part:-3}
+		return 0
+		;;
+	*)
+		echo
+		echo "If the number of disk cylinders does not exceed 1024, then ${OPSYSTEM}"
+		echo "can be installed alongside other operating systems on a single disk."
+		echo "Otherwise, it is system-dependent whether this will work or not."
+		echo "In the worst case, ${OPSYSTEM} MUST be installed at the beginning of"
+		echo "the disk, and existing partitions will be lost."
+		echo
+		echo "For now, we will assume that >1024 cylinders creates no problems..."
+		# FALL THROUGH
+		;;
+	esac
+fi
+# Case II: no partitions used
+if [ $sysid_cnt -eq 0 ]; then
+	echo
+	echo "	WARNING: partition table is either missing or corrupt."
+	echo "	Existing partitions will be lost."
+	part_cnt=${part_cnt:-4}
+	RUN_FDISK="overwrite"
+	opsys_off=1
+	cyls_per_opsys=`expr ${cyls_per_disk} - 1`
+	opsys_part=${unused_last_part:-3}
+	return 0
+# Case IIIa: overwrite an existing 386BSD/NetBSD/FreeBSD partition
+elif [ "$have_opsys_part" ]; then
+	echo
+	echo "386/Net/FreeBSD partition already exists!"
+	echo -n "Overwrite existing partition? [n] "
+	read resp junk
+	case "$resp" in
+	y*|Y*)
+		opsys_part=${have_opsys_part}
+		set_existing_part
+		return 0
+		;;
+	*)
+		have_opsys_part=
+		# FALL THROUGH
+		;;
+	esac
+fi
+
+# Case IIIb: no partitions available
+if [ $sysid_cnt -eq $part_cnt -a ! "$have_opsys_part" ]; then
+	echo
+	echo "No unused partitions."
+	echo -n "Install $OPSYSTEM and overwrite the entire disk? [n] "
+	read resp junk
+	case "$resp" in
+	y*|Y*)
+		# don't use first cylinder!
+		opsys_off=1
+		cyls_per_opsys=`expr $cyls_per_disk - 1`
+		opsys_part=${unused_last_part}
+		RUN_FDISK="overwrite"
+		;;
+	*)
+		set_overwrite_part
+		;;
+	esac
+	return 0
+fi
+
+
+# *** CAVEAT ***
+# $OPSYSTEM installs at the end of the disk.  If the
+# beginning of the disk is free but not the end, install fails!
+
+# Assume `fdisk -u' to add $OPSYSTEM in last unused partition for remaining cases
+opsys_part=${unused_last_part}
+RUN_FDISK="fdisk -u"
+mb_sect=`expr 1024 \* 1024 / $bytes_per_sect`
+disk_minimum=`expr $DISKMIN \* $mb_sect`
+
+# Case IV: No room (at end of disk) for mininal install
+[ $extent_max -eq 50000 ] && extent_max=$disksize
+disk_remaining=`expr $disksize - $extent_max`
+if [ $disk_remaining -lt $disk_minimum ]; then
+	echo
+	echo "Not enough space ($DISKMIN Mb) at end of disk to install $OPSYSTEM."
+	echo -n "Install FreeBSD and overwrite the entire disk? [n] "
+	read resp junk
+	case "$resp" in
+	y*|Y*)
+		# don't use first cylinder!
+		opsys_off=1
+		cyls_per_opsys=`expr $cyls_per_disk - 1`
+		opsys_part=${unused_last_part}
+		RUN_FDISK="overwrite"
+		;;
+	*)
+		echo
+		echo -n "Overwrite an existing partition? [n] "
+		read resp junk
+		case "$resp" in
+		y*|Y*)
+			set_overwrite_part
+			;;
+		*)
+			echo
+			echo "	WARNING: To install ${OPSYSTEM}, you're on your own in figuring"
+			echo "	out where on the disk it will fit without overwriting another"
+			echo "	partition..."
+			# Set defaults assuming there is only one partition at end of disk
+			eval start=\$start${extent_max_part}
+			# don't use first cylinder!
+			opsys_off=1
+			cyls_per_opsys=`expr $start / $cylindersize - 1`
+			[ $cyls_per_opsys -lt 0 ] && cyls_per_opsys=0
+			;;
+		esac
+		;;
+	esac
+	return 0
+fi
+
+# Case V: Room for $OPSYSTEM and partition data okay
+opsys_off=`expr $extent_max / $cylindersize`
+opsys_extent=`expr $opsys_off \* $cylindersize`
+[ $opsys_extent -lt $extent_max ] && opsys_off=`expr $opsys_off + 1`
+cyls_per_opsys=`expr $cyls_per_disk - $opsys_off`
+return 0
+}
+
+put_fdisk_data() {
+start=$root_offset
+size=$partition 
+
+if [ "$RUN_FDISK" = "overwrite" ]; then
+	# How do you overwrite without explicitly editing each entry?
+	(
+		echo y
+		echo $cyls_per_disk
+		echo $tracks_per_cyl
+		echo $sects_per_track
+		echo y
+	) >fdisk.script
+	i=0
+	n=`expr ${part_cnt:-4} - 1`
+	while [ $i -lt $n ]; do
+		echo y
+		echo 0
+		echo 0
+		echo 0
+		echo n
+		echo y
+		i=`expr $i + 1`
+	done >>fdisk.script
+	(	echo y
+		echo ${OPSYSID}
+		echo ${start}
+		echo ${size}
+		echo n
+		echo y
+		echo y
+		echo ${n}
+		echo y
+		echo y
+	) >>fdisk.script
+	fdisk -u /dev/r${drivename}d <fdisk.script >/dev/null 2>&1
+elif [ "$RUN_FDISK" ]; then
+	$RUN_FDISK -${opsys_part:-${unused_last_part:-3}} /dev/r${drivename}d <<-EOF >/dev/null 2>&1
+	y
+	$cyls_per_disk
+	$tracks_per_cyl
+	$sects_per_track
+	y
+	y
+	${OPSYSID}
+	${start}
+	${size}
+	n
+	y
+	y
+	${opsys_part:-${unused_last_part:-3}}
+	y
+	y
+	EOF
+fi
+
+}
+
+echo
+echo	"This program is designed to help put ${OPSYSTEM} on a hard disk with"
+echo	"at least $DISKMIN Megabytes of free space."
+echo
+echo	"Before starting, it is important to know your hard disk's geometry"
+echo	"(i.e., number of cylinders, heads and sectors/track).  If installing"
+echo	"${OPSYSTEM} on the same disk as another operating system, then the"
+echo	"two systems should use the same geometry.  In particular, ${OPSYSTEM}'s"
+echo	"default geometry is inappropriate for MS-DOS.  So in this case, the"
+echo	"DOS geometry should be used instead."
+echo
+echo	"As with anything which modifies a hard drive's contents, this program"
+echo	"can cause SIGNIFICANT DATA LOSS.  We strongly recommend making sure"
+echo	"that the hard drive is backed up before going further with the"
+echo	"installation process."
+echo
+echo -n "Proceed with installation? [y] "
+read resp junk
+resp=${resp:-y}
+case "$resp" in
+y*|Y*)
+	echo
+	echo	"Cool!  Let's get to it..."
+	echo
+	echo	"You will be given a chance to start over if you make a"
+	echo	"mistake during these questions."
+	echo	"At the end, you have the option of redoing the configuration."
+	echo	"If you really must quit at some point, type <CTRL>+C and"
+	echo	"enter \`halt' at the command prompt, \`#'."
+	;;
+*)
+	echo
+	echo	"OK, then.  Enter \`halt' to halt the machine."
+	echo	"Once the machine has halted, remove the floppy,"
+	echo	"and press any key to reboot."
+	exit
+	;;
+esac
+
+mount -u /dev/fd0 / || {
+	if mount -u /dev/fd1 / ; then
+		echo "[Please ignore the above error message, that's normal.]"
+	else
+		echo "Oh boy, we're in trouble here: Could not mount floppy read-write."
+		exit 1
+	fi
+}
+sync
+verified_install=""
+while [ ! "$verified_install" ]; do	# Begin of Big Loop
+
+rotdelay=""
+drivename=wd0
+drivetype=wd
+sect_fwd=""
+echo
+echo	"First, we need to know the drive type.  This can be can be one of"
+echo	"ESDI, SCSI, ST506, or IDE."
+echo -n "Drive type? [${type:-IDE}] "
+read resp junk
+type=${resp:-${type:-IDE}}
+case "$type" in
+e*|E*|st*|ST*)
+	echo -n "Does it support AUTOMATIC sector remapping? [y] "
+	read remap junk
+	case "$remap" in
+	n*|N*)
+		sect_fwd="sf:"
+		;;
+	esac
+	case "$type" in
+	e*|E*)
+		DEFSECT=36
+		;;
+	esac
+	;;
+i*|I*)
+	type=ST506
+	rotdelay="-d 0"
+	;;
+sc*|SC*)
+	drivename=sd0
+	drivetype=sd
+	type=SCSI
+	rotdelay="-d 0"
+	DEFSECT=32
+	DEFHEAD=64
+	;;
+*)
+	echo "Unknown type.  Assuming ST506 with automatic sectoring..."
+	type=ST506
+	;;
+esac
+if [ ! "$partition" ]; then
+	echo
+	echo	"Please wait.  Examining device /dev/r${drivename}d..."
+	get_fdisk_data
+	if [ $? -gt 1 ]; then
+		echo "Hm  - we can't seem to read that drive."
+		echo
+		echo -n "Are you sure that $type is the correct type? [n] "
+		read resp
+		case "$resp" in
+		y*|Y*)
+			echo
+			echo "Well, since we can't even open it, there isn't much"
+			echo "hope for writing a label  on it.  But you're free"
+			echo "to give it a try.  You need to specify the geometry."
+			;;
+		*)
+			echo
+			echo "Okay.  Let's start again from the top."
+			continue
+			;;
+		esac
+	fi
+fi
+echo
+echo	"Now we want to build a data base entry in /etc/disktab describing"
+echo	"the geometry of the /dev/$drivename disk.  The name of the entry"
+echo	"should be descriptive of the disk's type and model.  For example,"
+echo	"a Maxtor IDE, model 7080 disk might be named \`maxtor7080'."
+echo -n "Disk label name (one word, please)? [${name:-mfr_model}] "
+read resp junk
+name=${resp:-${name:-mfr_model}}
+echo
+echo	"${OPSYSTEM} should use the same hard disk geometry as used by other"
+echo	"operating systems on the hard disk."
+echo -n "Number of bytes per disk sector? [${bytes_per_sect:-512}] "
+read resp junk
+bytes_per_sect=${resp:-${bytes_per_sect:-512}}
+echo
+echo -n "Total number of disk cylinders? [${cyls_per_disk:-${DEFCYLN}}] "
+read resp junk
+cyls_per_disk=${resp:-${cyls_per_disk:-${DEFCYLN}}}
+echo
+echo -n "Number of disk heads (i.e., tracks/cylinder)? [${tracks_per_cyl:-${DEFHEAD}}] "
+read resp junk
+tracks_per_cyl=${resp:-${tracks_per_cyl:-${DEFHEAD}}}
+echo
+echo -n "Number of disk sectors (i.e., sectors/track)? [${sects_per_track:-${DEFSECT}}] "
+read resp junk
+sects_per_track=${resp:-${sects_per_track:-${DEFSECT}}}
+cylindersize=`expr $sects_per_track \* $tracks_per_cyl`
+disksize=`expr $cylindersize \* $cyls_per_disk`
+mb_sect=`expr 1024 \* 1024 / $bytes_per_sect`
+mb_per_disk=`expr $disksize / $mb_sect`
+opsys_cyls_min=`expr $DISKMIN \* $mb_sect / $cylindersize`
+analyze_fdisk_data
+if [ $? -eq 0 ]; then
+	partition=`expr $cyls_per_opsys \* $cylindersize`
+	part_offset=`expr $opsys_off \* $cylindersize`
+fi
+echo
+echo "Disk has a total of $mb_per_disk Mb."
+echo "The size of the ${OPSYSTEM} portion of the disk must be at least"
+echo "${opsys_cyls_min} cylinders, and should not exceed $(expr $cyls_per_disk - 1) cylinders."
+echo "The offset of ${OPSYSTEM} from the beginning of the disk should be at"
+echo "least 1 cylinder."
+echo 
+echo "For efficiency, partitions begin and end on cylinder boundaries."
+echo "If you know the size NN in Megabytes (Mb) of a partition you want, then"
+echo "use the following formula to determine the number NC of cylinders to use:"
+echo	"	NC = integer { ( NN * $mb_sect ) /  $cylindersize }"
+while :; do
+	echo -n "Total size of the ${OPSYSTEM} portion of the disk (in cylinders)? [${cyls_per_opsys:-`expr ${cyls_per_disk} - 1`}] "
+	read resp junk
+	cyls_per_opsys=${resp:-${cyls_per_opsys:-`expr ${cyls_per_disk} - 1`}}
+	partition=`expr $cyls_per_opsys \* $cylindersize`
+	if [ $cyls_per_opsys -lt $cyls_per_disk -a ! "$force_offset" ]; then
+		echo
+		echo -n "Offset of ${OPSYSTEM} from beginning of disk (in cylinders)? [${opsys_off:-1}] "
+		read resp junk
+		opsys_off=${resp:-${opsys_off:-1}}
+	else
+		echo
+		echo "	WARNING: Existing partitions will be lost.  In addition,"
+		echo "	installing at cylinder 0 may cause problems for some disk" 
+		echo "	controllers.  If the filesystem is corrupted or install"
+		echo "	fails, install at cylinder 1."
+		RUN_FDISK=""
+		cyls_per_opsys=$cyls_per_disk
+		partition=$disksize
+		opsys_off=0
+	fi
+	part_offset=`expr $opsys_off \* $cylindersize`
+	opsys_extent=`expr $opsys_off + $cyls_per_opsys`
+	if [ ${opsys_extent} -gt ${cyls_per_disk} ]; then 
+		echo
+		echo "${OPSYSTEM} Size + Offset cannot exceed ${cyls_per_disk} cylinders."
+	elif [ ${cyls_per_opsys} -lt ${opsys_cyls_min} ]; then
+		echo
+		echo "${OPSYSTEM} requires at least ${opsys_cyls_min} cylinders to install."
+	else	break 
+	fi
+done
+badspacesec=0
+if [ "$sect_fwd" = "sf:" ]; then
+	badspacecyl=`expr $sects_per_track + 126`
+	badspacecyl=`expr $badspacecyl + $cylindersize - 1`
+	badspacecyl=`expr $badspacecyl / $cylindersize`
+	badspacesec=`expr $badspacecyl \* $cylindersize`
+	echo
+	echo -n "Using $badspacesec sectors ($badspacecyl cylinders) for the "
+	echo "bad144 bad block table"
+fi
+whats_left=`expr $partition - $badspacesec`
+cyl_left=`expr $whats_left / $cylindersize`
+mb_left=`expr $whats_left / $mb_sect`
+swap_cyls_min=`expr $SWAPMIN \* $mb_sect / $cylindersize`
+root_cyls_max=`expr ${cyl_left} - ${swap_cyls_min}`
+root_cyls_min=`expr $ROOTMIN \* $mb_sect / $cylindersize`
+echo
+echo "There are $mb_left Mb ($cyl_left cylinders) to allocate."
+echo
+echo "The $OPSYSTEM portion of the disk must itself be divided into at least"
+echo "two partitions: one for the root filesystem and one for swap.  It is a"
+echo "good idea to have at least a third (large) $OPSYSTEM partition for the /usr"
+echo "filesystem."
+echo
+echo "The root partition cannot exceed ${root_cyls_max} cylinders.  It is usually"
+echo "no larger than about 15 Mb ($(expr 15 \* $mb_sect / $cylindersize) cylinders), and sometimes"
+echo "as small as $ROOTMIN Mb ($root_cyls_min cylinders)."
+if [ ! "$cyls_per_root" ]; then
+	# set default root partition to 15MB
+	cyls_per_root=`expr \( 15 \* $mb_sect \) /  $cylindersize`
+	usr_cyls_max=`expr ${root_cyls_max} - ${cyls_per_root}`
+	mb_usr=`expr ${usr_cyls_max} \* $cylindersize / $mb_sect`
+	[ $cyls_per_root -gt $root_cyls_max  -o $mb_usr -lt $USRMIN ] &&
+	cyls_per_root=$root_cyls_max
+fi
+while :; do
+	echo -n "Root partition size (in cylinders)? [${cyls_per_root}] "
+	read resp junk
+	cyls_per_root=${resp:-${cyls_per_root}}
+	root=`expr $cyls_per_root \* $cylindersize`
+	if [ ${cyls_per_root} -gt ${root_cyls_max} ]; then
+		echo
+		echo "The root partition size cannot exceed $root_cyls_max cylinders."
+	elif [ ${cyls_per_root} -lt ${root_cyls_min} ]; then
+		echo
+		echo "The root partition size must be at least $root_cyls_min cylinders."
+	else
+		part_used=`expr $root + $badspacesec`
+		break
+	fi
+done
+root_offset=$part_offset
+whats_left=`expr $partition - $part_used`
+cyl_left=`expr $whats_left / $cylindersize`
+mb_left=`expr $whats_left / $mb_sect`
+blocking_factor=2
+fragsize=`expr $bytes_per_sect \* $blocking_factor`
+blocksize=`expr $bytes_per_sect \* $blocking_factor \* 8`
+memsize=`dmesg | grep "^real mem" | awk '{ print $4 }'`
+mb_ram=`expr \( $memsize / 1024 / 1024 \) + 1`
+swap_mb=`expr \( 21 \* $mb_ram \) / 10`
+echo
+echo	"$mb_left Mb ($cyl_left cylinders) remaining in ${OPSYSTEM} portion of disk."
+echo
+echo	"Minimum swap space is $SWAPMIN Mb (${swap_cyls_min} cylinders.)"
+echo	"For running X, with your RAM size of $mb_ram Mb,"
+echo	"$swap_mb Mb (`expr \( \( 21 \* $mb_ram \* $mb_sect \) / 10 / ${cylindersize} \)` cylinders) of swap is recommended."
+if [ ! "$swap_cyl" ]; then
+	swap_cyl=`expr \( 21 \* $mb_ram \* $mb_sect \) / 10`
+	swap_cyl=`expr $swap_cyl / ${cylindersize}`
+
+	# but not swap size more than 10% of disk size...
+	swap_quot=`expr $mb_left / $mb_ram`
+	if [ $swap_quot -lt 10 ]; then
+		swap_cyl=$swap_cyls_min
+	fi
+fi
+while :; do
+	echo -n "Swap partition size (in cylinders)? [${swap_cyl}] "
+	read resp junk
+	swap_cyl=${resp:-${swap_cyl}}
+	swap=`expr $swap_cyl \* $cylindersize`
+	if [ ${swap_cyl} -gt ${cyl_left} ]; then
+		echo
+		echo "Swap size cannot exceed $cyl_left cylinders."
+	elif [ ${swap_cyl} -lt ${swap_cyls_min} ]; then
+		echo
+		echo "Swap size must be at least ${swap_cyls_min} cylinders."
+	else
+		break
+	fi
+done
+swap_offset=`expr $root_offset + $root`
+part_used=`expr $part_used + $swap`
+echo	"" >/etc/disktab
+echo	"$name|${OPSYSTEM} installation generated:\\" >>/etc/disktab
+echo	"	:dt=${type}:ty=winchester:\\" >>/etc/disktab
+echo -n "	:nc#${cyls_per_disk}:ns#${sects_per_track}" >>/etc/disktab
+echo	":nt#${tracks_per_cyl}:\\" >>/etc/disktab
+echo	"	:se#${bytes_per_sect}:${sect_fwd}\\" >>/etc/disktab
+echo -n "	:pa#${root}:oa#${root_offset}" >>/etc/disktab
+echo	":ta=4.2BSD:ba#${blocksize}:fa#${fragsize}:\\" >>/etc/disktab
+echo	"	:pb#${swap}:ob#${swap_offset}:tb=swap:\\" >>/etc/disktab
+echo	"	:pc#${partition}:oc#${part_offset}:\\" >>/etc/disktab
+ename="";fname="";gname="";hname=""
+if [ $part_used -lt $partition ]; then
+	echo
+	echo	"Now we enter information about any other partitions and filesystems"
+	echo	"to be created in the ${OPSYSTEM} portion of the disk.  This process"
+	echo	"is complete when we've filled up all remaining space in the ${OPSYSTEM}"
+	echo	"portion of the disk."
+fi
+while [ $part_used -lt $partition ]; do
+	part_size=0
+	whats_left=`expr $partition - $part_used`
+	cyl_left=`expr $whats_left / $cylindersize`
+	mb_left=`expr $whats_left / $mb_sect`
+	echo
+	echo	"$mb_left Mb ($cyl_left cylinders) remaining in ${OPSYSTEM} portion of disk."
+	echo
+	while :; do
+		echo -n "Next partition size (in cylinders)? [${cyl_left}] "
+		read resp junk
+		part_size=${resp:-${cyl_left}}
+		part_size=`expr $part_size \* $cylindersize`
+		total=`expr $part_used + $part_size`
+		if [ $total -gt $partition ]; then
+			echo
+			echo "Partition size cannot exceed ${cyl_left} cylinders." 
+		else
+			part_used=$total
+			part_name=""
+			while [ "$part_name" = "" ]; do
+				echo
+				echo -n "On which directory should this filesystem be mounted? [usr] "
+				read resp junk
+				part_name=${resp:-usr}
+				part_name=`expr X"$part_name" : 'X/*\(.*\)'`
+			done
+			break
+		fi
+	done
+	if [ ! "$ename" ]; then	
+		ename=$part_name
+		offset=`expr $part_offset + $root + $swap`
+		echo -n "	:pe#${part_size}:oe#${offset}" >>/etc/disktab
+		echo ":te=4.2BSD:be#${blocksize}:fe#${fragsize}:\\" >>/etc/disktab
+		offset=`expr $offset + $part_size`
+	elif [ ! "$fname" ]; then
+		fname=$part_name
+		echo -n "	:pf#${part_size}:of#${offset}" >>/etc/disktab
+		echo ":tf=4.2BSD:bf#${blocksize}:ff#${fragsize}:\\" >>/etc/disktab
+		offset=`expr $offset + $part_size`
+	elif [ ! "$gname" ]; then
+		gname=$part_name
+		echo -n "	:pg#${part_size}:og#${offset}" >>/etc/disktab
+		echo ":tg=4.2BSD:bg#${blocksize}:fg#${fragsize}:\\" >>/etc/disktab
+		offset=`expr $offset + $part_size`
+	elif [ ! "$hname" ]; then
+		hname=$part_name
+		echo -n "	:ph#${part_size}:oh#${offset}" >>/etc/disktab
+		echo ":th=4.2BSD:bh#${blocksize}:fh#${fragsize}:\\" >>/etc/disktab
+		part_used=partition
+	fi
+done
+if [ "$have_dos_part" -a "$have_dos_part" != "$opsys_part" -a \
+    "$RUN_FDISK" != "overwrite" -a ! "$hname" ]; then
+	echo
+	echo	"There appears to be a MS-DOS filesystem on the hard disk."
+	echo -n "Make this be accessible from ${OPSYSTEM}? [y] "
+	read resp junk
+	case "${resp:-y}" in
+	y*|Y*)
+		part_name=""
+		while [ "$part_name" = "" ]; do
+			echo
+			echo -n "On which directory should this filesystem be mounted? [dos] "
+			read resp junk
+			part_name=${resp:-dos}
+			part_name=`expr X"$part_name" : 'X/*\(.*\)'`
+		done
+		hname=$part_name
+		eval offset=\$start${have_dos_part}
+		eval part_size=\$size${have_dos_part}
+		echo -n "	:ph#${part_size}:oh#${offset}" >>/etc/disktab
+		echo ":th=MSDOS:\\" >>/etc/disktab
+		part_used=partition
+		;;
+	*)
+		have_dos_part=""
+		;;
+	esac
+else
+	have_dos_part=""
+fi
+echo	"	:pd#${disksize}:od#0:" >>/etc/disktab
+sync
+
+# cat /etc/disktab
+OIFS=$IFS
+IFS='
+'
+while read data; do
+	echo $data
+done < /etc/disktab
+IFS=$OIFS
+
+echo
+echo -n "Verbose installation? [n] "
+read resp
+
+case $resp in
+y*)
+	cpioverbose=-v
+	;;
+*)
+	cpioverbose=
+	;;
+esac
+
+
+echo
+echo	"OK!  THIS IS THE LAST CHANCE!!!  Data on the hard disk wil be lost."
+echo -n "Are you sure you want to install on the hard drive? (yes/no) "
+resp=""
+while [ ! "$resp" ]; do
+	read resp junk
+	case "$resp" in
+	Yes|yes|YES)
+		verified_install=1
+		echo
+		echo	"OK!  Here we go..."
+		;;
+	No|no|NO)
+		echo
+		echo -n "Would you like to change the configuration? [y] "
+		read resp junk
+		resp=${resp:-y}
+		case "$resp" in
+		y*|Y*)
+			;;
+		*)
+			echo
+			echo	"OK, then.  Enter 'halt' to halt the machine."
+			echo	"Once the machine has halted, remove the floppy,"
+			echo	"and press any key to reboot."
+			exit
+			;;
+		esac
+		;;
+	*)
+		echo "Please spell out either of \`yes' or \`no'..." 
+		echo -n "Install on the hard disk? (yes/no) " 
+		resp=
+		;;
+	esac
+done
+done	# End of Big Loop
+
+put_fdisk_data
+
+echo
+echo -n "Labelling disk..."
+echo y | 
+disklabel -w -r ${drivename} $name \
+  ${CDROM_FILESYSTEM}/usr/mdec/${drivetype}boot \
+  ${CDROM_FILESYSTEM}/usr/mdec/boot${drivetype}
+# XXX >/dev/null 2>&1
+echo	" done."
+
+if [ "$sect_fwd" = "sf:" ]; then
+	echo -n "Initializing bad144 badblock table..."
+	bad144 $drivename 0
+	echo " done."
+	echo "Updating badblock table..."
+	# `2>&1 >/dev/null' filters stdout and leaves only stderr...
+	badlist=$(bad144 -s $drivename 2>&1 >/dev/null |
+	while read data; do
+		bad_seek=$(expr "$data" : '[^(]*(seek)[^0-9]*\([0-9]*\)')
+		bad_read=$(expr "$data" : '[^(]*(read)[^0-9]*\([0-9]*\)')
+		[ "$bad_seek" -o "$bad_read" ] && echo -n "$bad_seek $bad_read "
+	done)
+	[ "$badlist" ] && bad144 -a -c $drivename "$badlist"
+	echo " done."
+fi
+
+echo	"Initializing root filesystem, and mounting..."
+newfs ${rotdelay} /dev/r${drivename}a $name
+mount -v /dev/${drivename}a /mnt
+if [ "$ename" != "" ]; then
+	echo
+	echo	"Initializing $ename filesystem, and mounting..."
+	newfs ${rotdelay} /dev/r${drivename}e $name
+	mkdir -p /mnt/$ename
+	mount -v /dev/${drivename}e /mnt/$ename
+fi
+if [ "$fname" != "" ]; then
+	echo
+	echo	"Initializing $fname filesystem, and mounting..."
+	newfs ${rotdelay} /dev/r${drivename}f $name
+	mkdir -p /mnt/$fname
+	mount -v /dev/${drivename}f /mnt/$fname
+fi
+if [ "$gname" != "" ]; then
+	echo
+	echo	"Initializing $gname filesystem, and mounting..."
+	newfs ${rotdelay} /dev/r${drivename}g $name
+	mkdir -p /mnt/$gname
+	mount -v /dev/${drivename}g /mnt/$gname
+fi
+if [ "$hname" != "" ]; then
+	echo
+	if [ ! "$have_dos_part" ]; then
+		echo	"Initializing $hname filesystem, and mounting..."
+		newfs ${rotdelay} /dev/r${drivename}h $name
+	else
+		echo	"Initializing $hname filesystem..."
+	fi
+	mkdir -p /mnt/$hname
+	[ ! "$have_dos_part" ] &&
+	mount -v /dev/${drivename}h /mnt/$hname
+fi
+
+echo
+echo "Please wait.  Copying to disk..."
+cd /mnt
+cat $CDROM_BINDIST | \
+ gunzip | tar --extract --file - --preserve-permissions ${cpioverbose} 
+
+echo "/dev/${drivename}a	/	ufs	rw 1 1" >etc/fstab
+if [ "$ename" != "" ]; then
+	echo "/dev/${drivename}e	/$ename	ufs	rw 1 2" >>etc/fstab
+fi
+if [ "$fname" != "" ]; then
+	echo "/dev/${drivename}f	/$fname	ufs	rw 1 3" >>etc/fstab
+fi
+if [ "$gname" != "" ]; then
+	echo "/dev/${drivename}g	/$gname	ufs	rw 1 4" >>etc/fstab
+fi
+if [ "$hname" != "" ]; then
+	if [ ! "$have_dos_part" ]; then
+		echo "/dev/${drivename}h	/$hname	ufs	rw 1 5" >>etc/fstab
+	else
+		echo "/dev/${drivename}h	/$hname	pcfs	rw 0 0" >>etc/fstab
+	fi
+fi
+
+cat /etc/disktab >etc/disktab.install
+cp -p /386bsd /mnt/386bsd
+
+echo
+echo "Building /dev files..."
+chroot /mnt sh <<!
+cd /dev
+sh MAKEDEV all
+cd /
+!
+echo " done."
+
+echo	"You will now be prompted for information about this"
+echo	"machine.  If you hit return, the default answer (in"
+echo	"brackets) will be used."
+
+echo
+echo -n "What is this machine's hostname? [unknown.host.domain] "
+read hname
+
+if [ "$hname" = "" ]; then
+	hname=unknown.host.domain
+fi
+echo $hname > /mnt/etc/myname
+proto_domain=`echo $hname | sed -e 's/[^.]*\.//'`
+
+echo
+echo	"What domain is this machine in (this is NOT its YP"
+echo -n "domain name)? [$proto_domain] "
+read dname
+
+if [ "$dname" = "" ]; then
+	dname=$proto_domain
+fi
+
+echo
+echo -n "Does this machine have an ethernet interface? [y] "
+read resp
+case "$resp" in
+n*)
+	;;
+*)
+	intf=
+	while [ "$intf" = "" ]; do
+		echo -n "What is the primary interface name (i.e. ed0, etc.)? "
+		read intf
+	done
+	echo -n "What is the hostname for this interface? [$hname] "
+	read ifname
+	if [ "$ifname" = "" ]; then
+		ifname=$hname
+	fi
+	ifaddr=
+	while [ "$ifaddr" = "" ]; do
+		echo -n "What is the IP address associated with this interface? "
+		read ifaddr
+	done
+	echo "$ifaddr    $ifname `echo $ifname | sed -e s/\.$dname//`" \
+		>> /mnt/etc/hosts
+
+	echo -n "Does this network have a special netmask? [n] "
+	read resp
+	case "$resp" in
+	y*)
+		echo -n "What is the netmask? [0xffffff00] "
+		read resp
+		if [ "$resp" = "" ]; then
+			ifnetmask="netmask 0xffffff00"
+		else
+			ifnetmask="netmask $resp"
+		fi
+		;;
+	*)
+		ifnetmask=
+		;;
+	esac
+	
+	echo -n "Does this network need additional flags? [n] "
+	read resp
+	case "$resp" in
+	y*)
+		echo -n "What flags? [llc0] "
+		read ifflags
+		if [ "$ifflags" = "" ]; then
+			ifflags=llc0
+		fi
+		;;
+	*)
+		ifflags=
+		;;
+	esac
+
+	echo "inet $ifname $ifnetmask $ifflags" > /mnt/etc/hostname.$intf
+		
+	echo	""
+	echo	"WARNING: you will need to finish the configuration of your"
+	echo	"network by editing /etc/netstart, read the comments in that"
+	echo	"file for more instructions."
+	;;
+esac
+
+echo
+echo	"Your system should be set up now for operation."
+
+sync
+
+echo
+echo	"The next step:  reboot from the hard disk and enjoy the system!"
+echo
+echo	"To do this, enter \`halt' now to halt the machine.  After it"
+echo	"announces that it has halted, remove the floppy from the drive"
+echo	"and press any key to boot."
+echo
+echo	"Okay, that's all for now.  I'm waiting for you to enter \`halt'..."
diff --git a/etc/etc.i386/cdinst1.profile b/etc/etc.i386/cdinst1.profile
new file mode 100644
index 000000000000..ce4d0caec2b2
--- /dev/null
+++ b/etc/etc.i386/cdinst1.profile
@@ -0,0 +1,71 @@
+#!bin/sh
+# cdinst1.profile floppy disk /.profile script
+PATH=/sbin:/bin:/usr/bin:/usr/sbin:.
+export PATH
+HOME=/root
+export HOME
+TERM=pc3
+export TERM
+TERMCAP="\
+pc3|ibmpc3:li#25:co#80:am:bs:bw:eo:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:\
+do=\E[B:ho=\E[;H:nd=\E[C:up=\E[A:so=\E[7m:se=\E[0m:us=\E[4m:ue=\E[0m:\
+:ac=l\332q\304k\277x\263j\331m\300w\302u\264v\301t\303n\305:\
+:kb=^h:kh=\E[Y:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:"
+export TERMCAP
+
+# To bad uname is not availiable here!
+#
+OPSYSTEM=FreeBSD
+export OPSYSTEM
+CDROM_TYPE=0
+export CDROM_TYPE
+CDROM_MOUNT=/cdrom
+export CDROM_MOUNT
+CDROM_FILESYSTEM=${CDROM_MOUNT}/filesys
+export CDROM_FILESYSTEM
+CDROM_BINDIST=${CDROM_MOUNT}/tarballs/bindist/bin_tgz.*
+export CDROM_BINDIST
+
+echo
+echo    "Welcome to ${OPSYSTEM}."
+echo
+
+# Lets find the cd rom drive and get it mounted so we have access to
+# all of the binaries, this is really ugly, but it uses the minimum
+# amount of support code and should always find us a cdrom drive if
+# there is one ready to use!
+
+while [ $CDROM_TYPE -eq 0 ]; do		# Begin of cd drive loop
+
+	mount -t isofs /dev/cd0a ${CDROM_MOUNT} >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		CDROM_TYPE=1
+		echo "Found and mounted SCSI CD ROM drive /dev/cd0a"
+	else
+		mount -t isofs /dev/mcd0a ${CDROM_MOUNT} >/dev/null 2>&1 
+		if [ $? -eq 0 ]; then
+			CDROM_TYPE=2
+			echo "Found and mounted Mitsumi CD ROM drive /dev/mcd0a"
+		else
+			mount -t isofs /dev/mcd1a ${CDROM_MOUNT} >/dev/null 2>&1
+			if [ $? -eq 0 ]; then
+				CDROM_TYPE=2
+				echo "Found and mounted Mitsumi CD ROM drive /dev/mcd1a"
+			else
+				CDROM_TYPE=0
+				echo "No cdrom drive found, are you sure the cd is in the"
+				echo "drive and the drive is ready? Press return to make"
+				echo -n "another attempt at finding the cdrom drive."
+				read resp
+			fi
+		fi
+	fi
+done					# End of cd drive loop
+
+# Okay, we now have a cdrom drive and know what device to call it by, and
+# it should be mounted, so lets reset our path so we can use all the binaries
+# from the cd rom drive and export the set up variables for the install script
+#
+PATH=/sbin:/bin:/usr/bin:/usr/sbin:${CDROM_FILESYSTEM}/sbin:${CDROM_FILESYSTEM}/bin:${CDROM_FILESYSTEM}/usr/bin:${CDROM_FILESYSTEM}/usr/sbin:.
+
+/install
diff --git a/etc/etc.i386/cpio.install b/etc/etc.i386/cpio.install
new file mode 100755
index 000000000000..f2f8dade9188
--- /dev/null
+++ b/etc/etc.i386/cpio.install
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+#	$Id: cpio.install,v 1.1 1994/02/21 21:51:50 rgrimes Exp $
+#
+
+echo
+echo -n "Copying to disk... "
+cd /
+gunzip < mnt/inst2.cpio.gz | cpio -idmu
+cd /mnt
+echo -n "Copying more to disk... "
+ls install magic | cpio -pdmu /
+echo -n "Copying even more to disk... "
+ls rc | cpio -pdmu /etc
+echo -n "Building /dev files... "
+cd /dev
+sh MAKEDEV all
+cd /
+echo "done."
+sync
diff --git a/etc/etc.i386/cpio.magic b/etc/etc.i386/cpio.magic
new file mode 100644
index 000000000000..d3a8e028533b
--- /dev/null
+++ b/etc/etc.i386/cpio.magic
@@ -0,0 +1,368 @@
+#!bin/sh
+#	$Id: cpio.magic,v 1.2.2.4 1994/05/01 20:53:40 rgrimes Exp $
+#
+set_tmp_dir()
+{
+	def_tmp_dir=`pwd`
+	[ "$def_tmp_dir" = "/" ] && def_tmp_dir=/usr/distrib
+	echo -n "Where do we ${1:-put} the distrbution files? [${def_tmp_dir}] "
+	read tmp_dir
+	[ ! "$tmp_dir" ] && tmp_dir=$def_tmp_dir
+	if [ ! -d "$tmp_dir" ]; then
+		/bin/rm -rf $tmp_dir
+		mkdir -p $tmp_dir
+	fi
+	echo
+}
+tmp_dir()
+{
+	if [ "$tmp_dir" = "" ]; then
+		set_tmp_dir $1
+	fi
+	cd $tmp_dir
+}
+load_fd()
+{
+	tmp_dir
+	drive=
+	altdrive=
+	subdir=
+	while [ -z "$drive" ]; do
+		echo -n "Read from which drive (or ? for help)? [c] "
+		read answer junk
+		case "${answer:-c}" in
+		a*b|A*B)	
+			drive=A; altdrive=B
+			;;
+		b*a|B*A)	
+			drive=B; altdrive=A
+			;;
+		a*|A*)	
+			drive=A; altdrive=A
+			;;
+		b*|B*)	
+			drive=B; altdrive=B
+			;;
+		c*|C*)
+			while read data; do
+				msdos_device=`expr X"$data" : 'X[ 	]*\([^ 	]*\)[^M]*pcfs'`
+				msdos_dir=`expr X"$data" : 'X[ 	]*[^ 	]*[ 	]*\([^ 	]*\)'`
+				[ "${msdos_device}" ] && break
+			done </etc/fstab
+			if [ ! "$msdos_device" ]; then
+				echo
+				echo	"Cannot find MS-DOS in filesystem table"
+				continue
+			fi
+			drive=C; altdrive=C
+			while :; do
+				echo
+				echo -n "Read from which MS-DOS drive C: directory? [/] "
+				read resp junk
+				newdir=$(echo "${resp:-/}" | \
+				awk '{ sub(/^[Cc]*:*/, ""); gsub(/\\/, "/"); gsub(/^\/*/, ""); gsub(/\/*$/, ""); print $0 }')
+				if [ -d ${msdos_dir}/${newdir} ]; then
+					subdir=$newdir
+					break
+				else
+					echo "C:/${newdir}: No such directory"
+				fi
+			done
+			;;
+		q*|Q*)	
+			drive=q
+			;;
+		\?*)	
+			echo
+			echo "Enter:		To:"
+			echo "------		---"
+			echo "  a		Read from floppy drive A:"
+			echo "  b		Read from floppy drive B:"
+			echo "  c		Read from MS-DOS hard drive C:"
+			echo "  ab		Alternate between A: and B:, starting with A:"
+			echo "  ba		Alternate between A: and B:, starting with B:"
+			echo "  q		Quit"
+			echo
+			;;
+		esac
+	done
+	verbose=-v
+	interactive=-i
+	if [ "$drive" = "C" ]; then
+		dir=${msdos_dir}
+	elif [ "$drive" != "q" ]; then
+		dir=/tmp/floppy
+		[ -d $dir ] && umount $dir >/dev/null 2>&1
+		[ -f $dir ] && rm -f $dir
+		mkdir -p $dir
+	fi
+	while [ "$drive" != "q" ]
+	do
+		device=/dev/fd0
+		[ "$drive" = "B" ] && device=/dev/fd1
+		[ "$drive" = "C" ] && device=${msdos_device}
+		echo; 
+		if [ "$drive" != "C" ]; then
+			echo	"Insert floppy in drive $drive:, then press RETURN to copy files,"
+			echo -n "or enter option (? for help): "
+		else
+			echo -n "Press RETURN to copy files, or enter option (? for help): "
+		fi
+		read answer junk
+		case "${answer:-g}" in
+		c*|C*)
+			if [ "$drive" != "C" ]; then
+				echo "Cannot change directory: not reading from MS-DOS drive C:"
+			else
+				echo
+				echo -n "Read from which MS-DOS drive C: directory? [/${subdir}] "
+				read resp junk
+				[ ! "$resp" ] && resp="/$subdir"
+				absolute=`expr X"$resp" : 'X[Cc]*:*\([/\]\)'`
+				subsub=$(echo "${resp}" | \
+				awk '{ sub(/^[Cc]*:*/, ""); gsub(/\\/, "/"); gsub(/^\/*/, ""); gsub(/\/*$/, ""); print $0 }')
+				if [ "$absolute" -o ! "$subdir" ]; then
+					newsub=$subsub
+				else
+					newsub=$subdir/$subsub
+				fi
+				if [ -d ${dir}/${newsub} ]; then
+					subdir=$newsub
+				else
+					echo "C:/${newsub}: No such directory"
+				fi
+			fi
+			;;
+		g*|G*)	
+			sync
+			if [ "$drive" = "C" ]; then
+				[ "$verbose" ] &&
+				{ echo; echo "Copying files from MS-DOS C:/${subdir}"; }
+				cp ${msdos_dir}/${subdir}/* .
+				sync
+			elif mount -t pcfs $verbose $device $dir; then 
+				[ "$verbose" ] && 
+				{ echo; echo "Copying files to disk..."; }
+				cp $interactive $dir/* .
+				sync
+				umount $dir
+				tmp=$drive; drive=$altdrive; altdrive=$tmp
+			fi
+			;;
+		i*|I*)	
+			tmp=$interactive; interactive=; [ -z "$tmp" ] && interactive=-i
+			tmp=on; [ -z "$interactive" ] && tmp=off
+			echo "interactive mode is $tmp"
+			;;
+		l*|L*)
+			sync
+			[ "$verbose" ] && echo "Directory of ${drive}:/${subdir}"
+			if [ "$drive" = "C" ]; then
+				ls -l $dir/${subdir}
+			else
+				umount $dir >/dev/null 2>&1
+				if mount -t pcfs $device $dir; then 
+					ls -l $dir/${subdir}
+					umount $dir
+				fi
+			fi
+			;;
+		o*|O*)	
+			tmp=$drive; drive=$altdrive; altdrive=$tmp
+			;;
+		q*|Q*)	
+			drive=q
+			;;
+		s*|S*)	
+			echo; echo -n "tmp_dir is set to $tmp_dir"
+			[ "$tmp_dir" != "`pwd`" ] && echo -n " (physically `pwd`)"
+			echo; echo "Free space in tmp_dir:"
+			df -k .
+			echo -n "Reading from drive $drive:"
+			[ "$drive" != "$altdrive" ] && echo -n " and drive $altdrive:"
+			echo
+			tmp=on; [ -z "$verbose" ] && tmp=off
+			echo "Verbose mode is $tmp"
+			tmp=on; [ -z "$interactive" ] && tmp=off
+			echo "Interactive mode is $tmp"
+			;;
+		v*|V*)	
+			tmp=$verbose; verbose=; [ -z "$tmp" ] && verbose=-v
+			tmp=on; [ -z "$verbose" ] && tmp=off
+			echo "verbose mode is $tmp"
+			;;
+		\?)	
+			echo
+			echo "Enter:		To:"
+			echo "-----		---"
+			echo "(just RETURN)	Copy files from ${drive}:/${subdir} to $tmp_dir"
+			echo "  c		Change directory of MS-DOS drive C:"
+			echo "  i		Toggle interactive mode (cp -i)"
+			echo "  l		List directory of current drive"
+			echo "  o		Read from alternate floppy drive"
+			echo "  q		Quit"
+			echo "  s		Show status"
+			echo "  v		Toggle verbose mode"
+			echo 
+			;;
+		esac
+	done
+	echo "Working directory: `pwd`"
+	unset verbose answer drive altdrive device dir subdir tmp interactive
+}
+load_dos()
+{
+	load_fd
+}
+load_qic_tape()
+{
+	tmp_dir
+	echo -n "Insert tape into QIC tape drive and hit return to continue: "
+	read foo
+	tar xvf /dev/rwt0
+}
+load_scsi_tape()
+{
+	tmp_dir
+	echo -n "Insert tape into SCSI tape drive and hit return to continue: "
+	read foo
+	tar xvf /dev/nrst0
+}
+extract()
+{
+	[ X"$1" = X"" ] && { echo "usage: extract dist-prefix"; return; }
+	tmp_dir find
+	echo -n "Would you like to be verbose about this? [n] "
+	read verbose
+	case $verbose in
+	y*|Y*)
+		tarverbose=--verbose
+		;;
+	*)
+		tarverbose=
+		;;
+	esac
+	#XXX ugly hack to eliminate busy files, copy them to /tmp and use them
+	#from there... even uglier.. we CAN NOT LOAD libc.so.1.0 from the tar
+	#balls or it spams tar!!
+	cp -p /bin/cat /usr/bin/gunzip /usr/bin/tar /tmp
+
+	#XXX more ugly hacks to get around busy text files/symlink problems.
+	if [ X"$1" = X"bin" ]; then
+		rm -f /bin/sh.$$ /sbin/init.$$ /etc/termcap.$$
+		mv /bin/sh /bin/sh.$$
+		mv /sbin/init /sbin/init.$$
+		mv /etc/termcap /etc/termcap.$$
+	fi
+	if [ X"$1" = X"des" ]; then
+		rm -f /sbin/init.$$
+		mv /sbin/init /sbin/init.$$
+	fi
+	for i in $*; do
+		/tmp/cat "$i"* | 
+		/tmp/gunzip |
+		(cd / ; /tmp/tar --extract --file - --preserve-permissions --exclude libc.so.1.0 ${tarverbose} )
+	done
+	rm -f /tmp/cat /tmp/gunzip /tmp/tar
+	sync
+	[ X"$1" = X"bin" ] && echo "Run \`configure' to complete installation." 
+	echo "(wd is now: `pwd`)"
+}
+configure()
+{
+	echo	"You will now be prompted for information about this"
+	echo	"machine.  If you hit return, the default answer (in"
+	echo	"brackets) will be used."
+
+	echo
+	echo -n "What is this machine's hostname? [unknown.host.domain] "
+	read hname
+
+	if [ "$hname" = "" ]; then
+		hname=unknown.host.domain
+	fi
+	echo $hname > /etc/myname
+	proto_domain=`echo $hname | sed -e 's/[^.]*\.//'`
+	
+	echo
+	echo	"What domain is this machine in (this is NOT its YP"
+	echo -n "domain name)? [$proto_domain] "
+	read dname
+
+	if [ "$dname" = "" ]; then
+		dname=$proto_domain
+	fi
+
+	echo
+	echo -n "Does this machine have an ethernet interface? [y] "
+	read resp
+	case "$resp" in
+	n*)
+		;;
+	*)
+		intf=
+		while [ "$intf" = "" ]; do
+			echo -n "What is the primary interface name (i.e. ed0, etc.)? "
+			read intf
+		done
+		echo -n "What is the hostname for this interface? [$hname] "
+		read ifname
+		if [ "$ifname" = "" ]; then
+			ifname=$hname
+		fi
+		ifaddr=
+		while [ "$ifaddr" = "" ]; do
+			echo -n "What is the IP address associated with this interface? "
+			read ifaddr
+		done
+		echo "$ifaddr    $ifname `echo $ifname | sed -e s/\.$dname//`" \
+			>> /etc/hosts
+
+		echo -n "Does this interface have a special netmask? [n] "
+		read resp
+		case "$resp" in
+		y*)
+			echo -n "What is the netmask? [0xffffff00] "
+			read resp
+			if [ "$resp" = "" ]; then
+				ifnetmask="netmask 0xffffff00"
+			else
+				ifnetmask="netmask $resp"
+			fi
+			;;
+		*)
+			ifnetmask=
+			;;
+		esac
+		
+		echo -n "Does this interface need additional flags? [n] "
+		read resp
+		case "$resp" in
+		y*)
+			echo -n "What flags? [llc0] "
+			read ifflags
+			if [ "$ifflags" = "" ]; then
+				ifflags=llc0
+			fi
+			;;
+		*)
+			ifflags=
+			;;
+		esac
+		
+		echo "inet $ifname $ifnetmask $ifflags" > /etc/hostname.$intf
+
+		echo	""
+		echo	"WARNING: if you have any more ethernet interfaces, you"
+		echo	"will have to configure them by hand.  Read the comments"
+		echo	"in /etc/netstart to learn how to do this"
+		;;
+	esac
+
+	sync
+
+	echo
+	echo	"OK.  You should be completely set up now."
+	echo	"You should now reboot your machine by issuing the 'reboot' command"
+	echo	"after removing anything that happens to be in your floppy drive."
+}
diff --git a/etc/etc.i386/cpio.rc b/etc/etc.i386/cpio.rc
new file mode 100644
index 000000000000..b7832ef7d339
--- /dev/null
+++ b/etc/etc.i386/cpio.rc
@@ -0,0 +1,92 @@
+#	$Id: cpio.rc,v 1.1.2.1 1994/03/06 08:44:08 rgrimes Exp $
+#
+
+stty status '^T'
+trap : 2
+trap : 3
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/distbin; export PATH
+if [ -e /fastboot ]
+then
+	echo Fast boot ... skipping disk checks
+else
+	echo Automatic reboot in progress...
+	fsck -p
+	case $? in
+	0)
+		;;
+	2)
+		exit 1
+		;;
+	4)
+		echo; echo README README README README README README README
+		echo
+		echo "NOTE: The above errors are expected if this is the"
+		echo "first time you have booted from the hard disk after"
+		echo "completing the floppy install"; echo
+		echo "Automatic file system check changed the root file system"
+		echo "The system must halt for these corrections to take effect"
+		echo
+		reboot
+		echo "reboot failed... help!"
+		exit 1
+		;;
+	8)
+		echo "Automatic file system check failed... help!"
+		exit 1
+		;;
+	12)
+		echo "Reboot interrupted"
+		exit 1
+		;;
+	130)
+		exit 1
+		;;
+	*)
+		echo "Unknown error in reboot"
+		exit 1
+		;;
+	esac
+fi
+
+trap 2
+trap "echo 'Reboot interrupted'; exit 1" 3
+umount -a >/dev/null 2>&1
+mount -a -t nonfs
+rm -f /fastboot
+(cd /var/run && { rm -rf -- *; cp /dev/null utmp; chmod 644 utmp; })
+
+OPSYSTEM=FreeBSD
+RELEASE="1.1"
+echo "${OPSYSTEM} Base System Release ${RELEASE}"
+echo ""
+echo "Congratulations, you've got ${OPSYSTEM} on the hard disk!"
+echo
+echo "Press the return key for more installation instructions"
+read junkit
+echo
+echo "To finish installation:"
+echo "Pick a temporary directory by running set_tmp_dir.  Make sure it's"
+echo "in a place with lots of space, probably under /usr."
+echo "Then, load the remaining distribution files into that temporary"
+echo "directory by issuing one of the following commands:"
+echo
+echo "	load_dos	load_fd	load_qic_tape	load_scsi_tape"
+echo
+echo "or by fetching the files with ftp (see the installation notes for"
+echo "information on how to do that)."
+echo
+echo "Once this is complete, extract the distribution files by issuing the"
+echo "command 'extract <distribution>'  where <distribution> is the base name"
+echo "of the distribution files, e.g. 'base10'."
+echo
+echo "Once all of the filesets you wish to install have been extracted,"
+echo "enter the command 'configure' to finish setting up the system"
+echo " "
+echo "If you should wish to uninstall ${OPSYSTEM}, delete the partition by using the"
+echo "DOS 5 FDISK program. If installed on the entire drive, use the FDISK/MBR"
+echo "to remove the ${OPSYSTEM} bootstrap from the drive."
+echo 'erase ^?, werase ^H, kill ^U, intr ^C'
+stty newcrt werase  intr  kill  erase  9600
+umask 0
+echo ". /magic" >>/.profile
+exit 1
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index 150941352f22..eab06be1d839 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -27,6 +27,71 @@
 # All partition sizes reserve space for bad sector tables.
 # (5 cylinders needed for maintenance + replacement sectors)
 #
+
+#
+# Floppy formats:
+#
+# To make a filesystem on a floppy:
+#    fdformat [-f <size>] fd<drive>[.<size>]
+#    disklabel -r -w fd<drive>[.<size>] fd<size>
+#    newfs fd<drive>[.<size>]
+#
+
+fd360:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#9:nc#40:\
+	:pa#720:oa#0:ba#4096:fa#512:\
+	:pb#720:ob#0:bb#4096:fb#512:\
+	:pc#720:oc#0:bc#4096:fc#512:
+
+fd720:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#9:nc#80:\
+	:pa#1440:oa#0:ba#4096:fa#512:\
+	:pb#1440:ob#0:bb#4096:fb#512:\
+	:pc#1440:oc#0:bc#4096:fc#512:
+
+fd1200|floppy5|5in|5.25in High Density Floppy:\
+	:ty=floppy:se#512:nt#2:rm#360:ns#15:nc#80:\
+	:pa#2400:oa#0:ba#4096:fa#512:\
+	:pb#2400:ob#0:bb#4096:fb#512:\
+	:pc#2400:oc#0:bc#4096:fc#512:
+
+fd1440|floppy|floppy3|3in|3.5in High Density Floppy:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+	:pa#2880:oa#0:ba#4096:fa#512:\
+	:pb#2880:ob#0:bb#4096:fb#512:\
+	:pc#2880:oc#0:bc#4096:fc#512:
+
+#
+# Stressed floppy-formats.  No guarantees given.
+#
+
+fd800:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#10:nc#80:\
+	:pa#1600:oa#0:ba#4096:fa#512:\
+	:pb#1600:ob#0:bb#4096:fb#512:\
+	:pc#1600:oc#0:bc#4096:fc#512:
+
+fd820:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#10:nc#82:\
+	:pa#1640:oa#0:ba#4096:fa#512:\
+	:pb#1640:ob#0:bb#4096:fb#512:\
+	:pc#1640:oc#0:bc#4096:fc#512:
+
+fd1480:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#82:\
+	:pa#2952:oa#0:ba#4096:fa#512:\
+	:pb#2952:ob#0:bb#4096:fb#512:\
+	:pc#2952:oc#0:bc#4096:fc#512:
+
+fd1720:\
+	:ty=floppy:se#512:nt#2:rm#300:ns#21:nc#82:\
+	:pa#3444:oa#0:ba#4096:fa#512:\
+	:pb#3444:ob#0:bb#4096:fb#512:\
+	:pc#3444:oc#0:bc#4096:fc#512:
+
+#
+# Harddisk formats
+#
 qp120at|Quantum Peripherals 120MB IDE:\
 	:dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813:sf: \
 	:pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
@@ -72,18 +137,6 @@ cp3100new|Connor Peripherals 100MB IDE, with a different configuration:\
 	:pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
 	:ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
 
-floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pb#2880:ob#0:\
-	:pc#2880:oc#0:
-
-floppy5|5in|5.25in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#15:nc#80:\
-	:pa#2400:oa#0:ba#4096:fa#512:
-	:pb#2400:ob#0:bb#4096:fb#512:
-	:pc#2400:oc#0:bc#4096:fc#512:
-
 maxtor4380|Maxtor XT4380E ESDI :\
 	:dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222:sf: \
 	:pa#21600:oa#0:ta=4.2BSD:ba#4096:fa#512:\
diff --git a/etc/etc.i386/floppy.install_notes b/etc/etc.i386/floppy.install_notes
index b76c932d75cd..5b457018ee82 100644
--- a/etc/etc.i386/floppy.install_notes
+++ b/etc/etc.i386/floppy.install_notes
@@ -1,6 +1,6 @@
                         FLOPPY INSTALLATION NOTES
                                 FreeBSD
-                              Release 1.0
+                              Release 1.1
 
 Welcome to FreeBSD!  This document has been put together in an effort
 to make initial installation of the system from floppy as easy as possible.
@@ -22,7 +22,7 @@ to make initial installation of the system from floppy as easy as possible.
 	Adaptec 174x series
 	Buslogic 545S
 
-    Then please use the disk image:	kcopy-ah-floppy
+    Then please use the disk image:	kcopy_ah.flp
     to construct your boot floppy.
 
     If your disk controller is one of:
@@ -30,13 +30,13 @@ to make initial installation of the system from floppy as easy as possible.
 	Bustek 742a
 	UltraStore 14F or 34F
 
-    Then please use the disk image:	kcopy-bt-floppy
+    Then please use the disk image:	kcopy_bt.flp
     to construct your boot floppy.
 
-    Next, make a second floppy from the disk image:	filesystem-floppy
+    Next, make a second floppy from the disk image:	filesyst.flp
     You'll need this for the second stage of the boot process.
 
-    Finally, make a third floppy from the disk image:	cpio-floppy
+    Finally, make a third floppy from the disk image:	cpio.flp
     You'll need this for the last stage of the boot process.
 
     If you want to use any of the optional tools in the tools
@@ -53,7 +53,7 @@ to make initial installation of the system from floppy as easy as possible.
     the dos floppy in the last stage of the boot process.
 
 2.  Boot the first floppy.  When it asks you to insert the file system floppy,
-    insert the second floppy ``filesystem-floppy.''  Follow the instructions
+    insert the second floppy ``filesyst.flp.''  Follow the instructions
     that floppy gives you.  If partitions  already exist on the hard disk,
     then by default FreeBSD attempts to install itself at the end of these.
     Before rebooting, note the type of disk it says to copy the kernel
@@ -69,12 +69,12 @@ to make initial installation of the system from floppy as easy as possible.
 
 4.  Making sure that there's no floppy in the drive, press return to boot
     from the hard disk.  After it has booted and is asking what drive the
-    cpio floppy is in, insert the third floppy ``cpio-floppy'' into a
+    cpio floppy is in, insert the third floppy ``cpio.flp'' into a
     floppy drive and answer the question about what drive it is in.
     Note that 0 is the same as DOS drive A:, and 1 is the same as DOS
     drive B:
 
-5.  After the cpio-floppy has been copied to the disk, remove it from the
+5.  After the cpio floppy has been copied to the disk, remove it from the
     drive.  If there are programs on the dos-floppy that you would like
     installed, then insert this disk in a floppy drive, again specifying 
     the drive to read from.
@@ -97,30 +97,20 @@ to make initial installation of the system from floppy as easy as possible.
 10. Follow the instructions about set_tmp_dir and extract that
     will come on your screen after you've pressed the return key.
 
-11. You will get the following errors while extracting the bin
-    distribution, which you can safely ignore:
-
-	/tmp/tar: Could not create file bin/sh : Text file busy
-	/tmp/tar: Could not create file sbin/init : Text file busy
-	/tmp/tar: Could not link .profile to root/.profile : File exists
-
-12. Run the configure command to set up some of the /etc files by
+11. Run the configure command to set up some of the /etc files by
     typing ``configure''.  You will have to edit /etc/netstart after
     this if you have a networking interface.
 
-13. Reboot so that the system comes up multiuser by typing ``reboot''.
+12. Reboot so that the system comes up multiuser by typing ``reboot''.
 
-14. You are now running FreeBSD!  Congradulations!  You may now continue
+13. You are now running FreeBSD!  Congradulations!  You may now continue
     with installing the source distribution, or stop here for now.
 
-    Should you decided to postpone further installation, you should
-    probably save the ``installing profile'' for possible future use by
-    saving it and linking a default profile into place.
-
-    Do it like this:
+14. The file /magic contains the special sh commands used during
+    installation.  Should you need to use them you can do the following.
 
-	mv /.profile /.profile.install
-	ln /root/.profile /.profile
+	/bin/sh
+	. /magic
 
 15. If your disk has several operating systems, you may want to
     install the Thomas Wolfram's os-bs boot manager for selecting
@@ -150,4 +140,4 @@ to make initial installation of the system from floppy as easy as possible.
     freebsd.cdrom.com - please have a look around!  You may also find 
     this a good time to read the release notes in RELNOTES.FreeBSD.
     
-End of $Id: floppy.install_notes,v 1.12 1993/10/16 12:41:36 jkh Exp $
+End of $Id: floppy.install_notes,v 1.13.2.1 1994/05/05 03:58:27 rgrimes Exp $
diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install
index cd6626bbb07e..d6fce87bc433 100755
--- a/etc/etc.i386/inst1.install
+++ b/etc/etc.i386/inst1.install
@@ -226,17 +226,21 @@ if [ $sysid_cnt -eq 0 ]; then
 elif [ "$have_opsys_part" ]; then
 	echo
 	echo "386/Net/FreeBSD partition already exists!"
-	echo -n "Overwrite existing partition? [n] "
+	echo "${OPSYSTEM} cannot be installed alongside an existing BSD partition."
+	echo -n "Overwrite existing partition? [y] "
 	read resp junk
-	case "$resp" in
+	case "${resp:-y}" in
 	y*|Y*)
 		opsys_part=${have_opsys_part}
 		set_existing_part
 		return 0
 		;;
 	*)
-		have_opsys_part=
-		# FALL THROUGH
+		echo
+		echo	"Installation aborted.  Enter \`halt' to halt the machine."
+		echo	"Once the machine has halted, remove the floppy,"
+		echo	"and press any key to reboot."
+		exit
 		;;
 	esac
 fi
@@ -381,6 +385,8 @@ fi
 
 }
 
+echo
+echo
 echo	"Welcome to ${OPSYSTEM}."
 echo
 echo	"This program is designed to help put ${OPSYSTEM} on a hard disk with"
@@ -413,15 +419,15 @@ y*|Y*)
 	;;
 *)
 	echo
-	echo	"OK, then.  Enter \`halt' to halt the machine."
+	echo	"Installation aborted.  Enter \`halt' to halt the machine."
 	echo	"Once the machine has halted, remove the floppy,"
 	echo	"and press any key to reboot."
 	exit
 	;;
 esac
 
-mount -u /dev/fd0a / || {
-	if mount -u /dev/fd1a / ; then
+mount -u /dev/fd0 / || {
+	if mount -u /dev/fd1 / ; then
 		echo "[Please ignore the above error message, that's normal.]"
 	else
 		echo "Oh boy, we're in trouble here: Could not mount floppy read-write."
@@ -478,7 +484,7 @@ echo
 echo	"Disk is of device type $drivetype."
 if [ ! "$partition" ]; then
 	echo
-	echo	"Please wait.  Examining device /dev/r${drivename}d..."
+	echo	"Examining device /dev/r${drivename}d..."
 	get_fdisk_data
 	if [ $? -gt 1 ]; then
 		echo "Hm  - we can't seem to read that drive."
@@ -494,7 +500,7 @@ if [ ! "$partition" ]; then
 			;;
 		*)
 			echo
-			echo "Okay.  Let's start again from the top."
+			echo "Oops.  Let's start again from the top."
 			continue
 			;;
 		esac
@@ -754,8 +760,8 @@ while [ $part_used -lt $partition ]; do
 		part_used=partition
 	fi
 done
-if [ "$have_dos_part" != "$opsys_part" -a "$RUN_FDISK" != "overwrite" -a \
-    ! "$hname" ]; then
+if [ "$have_dos_part" -a "$have_dos_part" != "$opsys_part" -a \
+    "$RUN_FDISK" != "" -a "$RUN_FDISK" != "overwrite" -a ! "$hname" ]; then
 	echo
 	echo	"There appears to be a MS-DOS filesystem on the hard disk."
 	echo -n "Make this be accessible from ${OPSYSTEM}? [y] "
@@ -811,7 +817,7 @@ esac
 
 
 echo
-echo	"OK!  THIS IS THE LAST CHANCE!!!  Data on the hard disk wil be lost."
+echo	"THIS IS THE LAST CHANCE!!!  Data on the hard disk will be lost!"
 echo -n "Are you sure you want to install on the hard drive? (yes/no) "
 resp=""
 while [ ! "$resp" ]; do
@@ -820,7 +826,7 @@ while [ ! "$resp" ]; do
 	Yes|yes|YES)
 		verified_install=1
 		echo
-		echo	"OK!  Here we go..."
+		echo	"Here we go..."
 		;;
 	No|no|NO)
 		echo
@@ -832,7 +838,7 @@ while [ ! "$resp" ]; do
 			;;
 		*)
 			echo
-			echo	"OK, then.  Enter 'halt' to halt the machine."
+			echo	"Installation aborted.  Enter 'halt' to halt the machine."
 			echo	"Once the machine has halted, remove the floppy,"
 			echo	"and press any key to reboot."
 			exit
@@ -856,6 +862,10 @@ echo y |
 /sbin/disklabel -w -r ${drivename} $name /usr/mdec/${drivetype}boot /usr/mdec/boot${drivetype} >/dev/null 2>&1
 echo	" done."
 
+# XXX - Do it again, incase we disklabeled sector 0!
+# XXX - this is not working for some reason, need to look at it closer!
+put_fdisk_data
+
 if [ "$sect_fwd" = "sf:" ]; then
 	echo -n "Initializing bad144 badblock table..."
 	bad144 $drivename 0
@@ -902,7 +912,7 @@ if [ "$hname" != "" ]; then
 		echo	"Initializing $hname filesystem, and mounting..."
 		newfs ${rotdelay} /dev/r${drivename}h $name
 	else
-		echo	"Initializing $hname filesystem..."
+		echo	"Preparing for $hname filesystem, and mounting..."
 	fi
 	mkdir -p /mnt/$hname
 	[ ! "$have_dos_part" ] &&
@@ -910,19 +920,17 @@ if [ "$hname" != "" ]; then
 fi
 
 echo
-echo "Please wait.  Copying to disk..."
+echo -n "Copying to disk... "
 cd /
-# cat filelist | cpio -pdamu${cpioverbose} /mnt
-OIFS=$IFS
-IFS='
-'
-while read data; do 
-	echo $data
-done <filelist | cpio -pdamu${cpioverbose} /mnt
-IFS=$OIFS
-
+cpio -pdamu${cpioverbose} /mnt <filelist
+echo -n "Copying more to disk... "
 cd /mnt
-echo "/dev/${drivename}a	/	ufs	rw 1 1" >etc/fstab
+gzcat < /inst1.cpio.gz | cpio -idmu${cpioverbose}
+
+echo -n "Building /etc/fstab... "
+echo "proc		/proc	procfs	rw 0 0" >etc/fstab
+echo "/dev/${drivename}b	none	swap	sw 0 0" >>etc/fstab
+echo "/dev/${drivename}a	/	ufs	rw 1 1" >>etc/fstab
 if [ "$ename" != "" ]; then
 	echo "/dev/${drivename}e	/$ename	ufs	rw 1 2" >>etc/fstab
 fi
@@ -936,7 +944,7 @@ if [ "$hname" != "" ]; then
 	if [ ! "$have_dos_part" ]; then
 		echo "/dev/${drivename}h	/$hname	ufs	rw 1 5" >>etc/fstab
 	else
-		echo "/dev/${drivename}h	/$hname	pcfs	rw 0 0" >>etc/fstab
+		echo "/dev/${drivename}h	/$hname	pcfs	ro 0 0" >>etc/fstab
 	fi
 fi
 
@@ -948,10 +956,11 @@ while read data; do
 	echo $data
 done </etc/disktab >etc/disktab.install
 IFS=$OIFS
+echo "done."
 
-# cat << EOF >.profile
+echo -n "Building /etc/rc... "
 (
-echo "PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/distbin:.:"
+echo "PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/distbin:"
 echo "export PATH"
 echo "HOME=/root"
 echo "export HOME"
@@ -959,11 +968,12 @@ echo "TERM=pc3"
 echo "export TERM"
 echo "mount -at ufs"
 echo "echo" 
+echo "echo" 
 echo "echo	\"Insert cpio installation floppy in drive and\""
-echo "echo -n	\"enter that drive's number (0 or 1): [0] \""
+echo "echo -n	\"enter that drive's number (0 = A:,  1 = B:): [0] \""
 echo "read resp junk"
 echo "driveno=\${resp:-0}"
-echo "mount -o ro /dev/fd\${driveno}a /mnt"
+echo "mount -o ro /dev/fd\${driveno} /mnt"
 echo "cd /mnt"
 echo "install"
 echo "cd /"
@@ -974,15 +984,16 @@ echo "read resp junk"
 echo "case \"\$resp\" in"
 echo "y*|Y*)"
 echo "	echo"	
-echo "	echo	\"Remove cpio floppy from drive, insert dos floppy, and\""
+echo "	echo	\"Insert dos floppy in drive, and then\""
 echo "	echo -n	\"enter that drive's number (0 or 1): [0] \""
 echo "	read resp junk"
 echo "	driveno=\${resp:-0}"
-echo "	mount -t pcfs -o ro /dev/fd\${driveno}a /mnt"
+echo "  echo	\"Copying files to /usr/distbin...\""
+echo "	mount -t pcfs -o ro /dev/fd\${driveno} /mnt"
 echo "	mkdir -p /usr/distbin"
 echo "	cp /mnt/* /usr/distbin/ >/dev/null 2>&1"
-echo "	sync"
 echo "	umount /mnt >/dev/null 2>&1"
+echo "	sync"
 echo "	;;"
 echo "esac"
 echo "echo"
@@ -994,7 +1005,9 @@ echo "echo"
 echo "echo	\"Enter 'halt' now at the prompt to halt the machine.\""
 echo "echo	\"After the machine has halted, remove the floppy from the disk\""
 echo "echo	\"drive, and hit any key to reboot from the hard disk.\""
-) >.profile
+echo "exit 1"
+) >etc/rc
+echo "done."
 
 sync
 
@@ -1010,6 +1023,9 @@ echo	"floppy this time, just hit RETURN without changing floppies."
 echo
 echo	"If all goes well, you can enter the command \`copy' at the prompt to"
 echo	"copy the kernel to the hard disk.  When asked for which partition to"
-echo	"copy to, enter  to \`${drivename}a' (without the quotes)."
+echo	"copy to, enter \`${drivename}a' (without the quotes)."
 echo
 echo	"Okay, that's all for now.  I'm waiting for you to enter \`halt'..."
+
+sync;sync;sync;sync
+
diff --git a/etc/etc.i386/inst1.profile b/etc/etc.i386/inst1.profile
index 300db6dc67c4..d4afab194eef 100644
--- a/etc/etc.i386/inst1.profile
+++ b/etc/etc.i386/inst1.profile
@@ -1,7 +1,9 @@
+#	$Id: inst1.profile,v 1.3 1994/02/21 21:51:57 rgrimes Exp $
+#
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:.:
 export PATH
 HOME=/root
 export HOME
 TERM=pc3
 export TERM
-install
+/install
diff --git a/etc/etc.i386/inst2.install b/etc/etc.i386/inst2.install
deleted file mode 100755
index 0ef2d46f6b1f..000000000000
--- a/etc/etc.i386/inst2.install
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# install2.fs disk 'install'
-# Simplified, interactive FreeBSD installation script.
-# D.E. Silvia (dsilvia@net.com)
-#
-# Heavily hacked on for support of FreeBSD
-# by Rodney W. Grimes (rgrimes@cdrom.com) 1993/08/11
-#
-# Installs balance of basic FreeBSD system.
-#
-
-echo -n "Verbose installation? [n] "
-read resp
-case $resp in
-	y*)
-		cpioverbose=v
-		;;
-	*)
-		cpioverbose=
-		;;
-esac
-
-echo
-echo "Please wait.  Copying to disk..."
-# remove /.profile so that the right things happen when it gets
-# over written
-rm /.profile
-cd /
-mnt/usr/bin/gunzip < mnt/inst2.cpio.gz | cpio -idmu${cpioverbose}
-cd /mnt
-ls .profile install usr/bin/* | cpio -pdmu${cpioverbose} /
-cd /dev
-echo " done."
-echo
-echo "Building /dev files..."
-sh MAKEDEV all
-cd /
-echo " done."
-
-sync
diff --git a/etc/etc.i386/inst2.profile b/etc/etc.i386/inst2.rc
index 759828845cbb..c64ebfd30d27 100644
--- a/etc/etc.i386/inst2.profile
+++ b/etc/etc.i386/inst2.rc
@@ -1,8 +1,13 @@
+#	$Id: inst2.rc,v 1.1.2.2 1994/03/18 03:11:06 rgrimes Exp $
+#
+
 stty status '^T'
 trap : 2
 trap : 3
-HOME=/; export HOME
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/distbin; export PATH
+
+echo
+echo
 if [ -e /fastboot ]
 then
 	echo Fast boot ... skipping disk checks
@@ -53,16 +58,8 @@ mount -a -t nonfs
 rm -f /fastboot
 (cd /var/run && { rm -rf -- *; cp /dev/null utmp; chmod 644 utmp; })
 
-TERM=pc3	# terminal emulator, for elvis
-TERMCAP="\
-pc3|ibmpc3:li#25:co#80:am:bs:bw:eo:cd=\E[J:ce=\E[K:cl=\Ec:cm=\E[%i%2;%2H:\
-do=\E[B:ho=\E[;H:nd=\E[C:up=\E[A:so=\E[7m:se=\E[0m:us=\E[4m:ue=\E[0m:\
-:ac=l\332q\304k\277x\263j\331m\300w\302u\264v\301t\303n\305:\
-:kb=^h:kh=\E[Y:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:"
 OPSYSTEM=FreeBSD
-RELEASE="1.0"
-export TERMCAP
-export TERM
+RELEASE="1.1"
 echo "${OPSYSTEM} Base System Release ${RELEASE}"
 echo ""
 echo "Congratulations, you've got ${OPSYSTEM} on the hard disk!"
@@ -76,7 +73,7 @@ echo "in a place with lots of space, probably under /usr."
 echo "Then, load the remaining distribution files into that temporary"
 echo "directory by issuing one of the following commands:"
 echo
-echo "	load_fd		load_qic_tape	load_scsi_tape"
+echo "	load_dos	load_fd		load_qic_tape	load_scsi_tape"
 echo
 echo "or by fetching the files with ftp (see the installation notes for"
 echo "information on how to do that)."
@@ -88,12 +85,14 @@ echo
 echo "Once all of the filesets you wish to install have been extracted,"
 echo "enter the command 'configure' to finish setting up the system"
 echo " "
-echo "If you should wish to uninstall ${OPSYSTEM}, delete the partition by using the"
+echo "If you wish to uninstall ${OPSYSTEM}, delete the partition by using the"
 echo "DOS 5 FDISK program. If installed on the entire drive, use the FDISK/MBR"
 echo "to remove the ${OPSYSTEM} bootstrap from the drive."
 echo 'erase ^?, werase ^H, kill ^U, intr ^C'
 stty newcrt werase  intr  kill  erase  9600
 umask 0
+exit 1
+
 set_tmp_dir()
 {
 	def_tmp_dir=`pwd`
@@ -191,8 +190,8 @@ load_fd()
 	fi
 	while [ "$drive" != "q" ]
 	do
-		device=/dev/fd0a
-		[ "$drive" = "B" ] && device=/dev/fd1a
+		device=/dev/fd0
+		[ "$drive" = "B" ] && device=/dev/fd1
 		[ "$drive" = "C" ] && device=${msdos_device}
 		echo; 
 		if [ "$drive" != "C" ]; then
@@ -230,12 +229,12 @@ load_fd()
 			sync
 			if [ "$drive" = "C" ]; then
 				[ "$verbose" ] &&
-				{ echo; echo "Please wait.  Copying files from MS-DOS C:/${subdir}"; }
+				{ echo; echo "Copying files from MS-DOS C:/${subdir}"; }
 				cp ${msdos_dir}/${subdir}/* .
 				sync
 			elif mount -t pcfs $verbose $device $dir; then 
 				[ "$verbose" ] && 
-				{ echo; echo "Please wait.  Copying files to disk..."; }
+				{ echo; echo "Copying files to disk..."; }
 				cp $interactive $dir/* .
 				sync
 				umount $dir
@@ -303,6 +302,10 @@ load_fd()
 	echo "Working directory: `pwd`"
 	unset verbose answer drive altdrive device dir subdir tmp interactive
 }
+load_dos
+{
+	load_fd
+}
 load_qic_tape()
 {
 	tmp_dir
@@ -376,7 +379,7 @@ configure()
 	*)
 		intf=
 		while [ "$intf" = "" ]; do
-			echo -n "What is the primary interface name (i.e. we0, etc.)? "
+			echo -n "What is the primary interface name (i.e. ed0, etc.)? "
 			read intf
 		done
 		echo -n "What is the hostname for this interface? [$hname] "
@@ -422,7 +425,7 @@ configure()
 			;;
 		esac
 		
-		echo "inet $ifname $ifnetmask $ifflags" > /etc/hostname.$intf
+		echo "inet $ifname netmask $ifnetmask $ifflags" > /etc/hostname.$intf
 
 		echo	""
 		echo	"WARNING: if you have any more ethernet interfaces, you"
diff --git a/etc/etc.i386/install_notes b/etc/etc.i386/install_notes
index 79c18e9f5396..fbf74c83aecc 100644
--- a/etc/etc.i386/install_notes
+++ b/etc/etc.i386/install_notes
@@ -1,13 +1,7 @@
                              INSTALLATION NOTES
                                   FreeBSD
-                                Release 1.0
+                                Release 1.1
 
-These notes have been prepared from those written originally for NetBSD
-0.9. The conversion was done by someone who has had experience with
-installing and upgrading 386bsd, but who is not a unix guru, so there
-will be slant towards this experience. Corrections/updates are
-welcomed, it is difficult/impossible to test every last hardware
-combination.
 
 Be sure to read _ALL_ of this document before you try to install
 FreeBSD.  FreeBSD probably looks a bit similar to things that you've
@@ -15,12 +9,12 @@ seen before (perhaps 386BSD), but the installation procedures are quite
 different.
 
 
-FreeBSD 1.0 Release Contents:
+FreeBSD Release Contents:
 ------- --- ------- --------
 
-The FreeBSD 1.0 Release consists of the following elements:
+The FreeBSD Release consists of the following elements:
 
-Bootable Kernel-copy floppies
+Bootable Kernel copy floppies
 
 	These disks are bootable and have enough utilities on
 	board to copy a new kernel to a prepared hard disk.  While
@@ -28,10 +22,10 @@ Bootable Kernel-copy floppies
 	also make upgrading to a new kernel easy:  boot from it,
 	and copy a new kernel to disk.
 
-	You must choose between one of two kernel-copy floppy
+	You must choose between one of two kernel copy floppy
 	images, depending on your disk controller type.  The
-	"kcopy-ah-floppy" image supports the Adaptec 154x and 1742
-	SCSI adapters, while "kcopy-bt-floppy" supports the Bustek
+	"kcopy_ah.flp" image supports the Adaptec 154x and 1742
+	SCSI adapters, while "kcopy_bt.flp" supports the Bustek
 	742 and Ultrastore SCSI adapters.  For systems with only
 	MFM, RLL, ESDI or IDE disk controllers, either image can
 	be used.
@@ -42,8 +36,8 @@ Installation floppies
 	disks are required to prepare your hard drive for FreeBSD
 	and to install the FreeBSD distribution.  Like the boot
 	floppies, these are distributed as binary images.  They are
-	are referred to below as the  "filesystem-floppy" and the
-	"cpio-floppy".
+	are referred to below as the  "filesyst.flp" and the
+	"cpio.flp".
 
 	There is also an optional fourth installation disk referred
 	to as the "dos-floppy".  Unlike the other install disks,
@@ -71,21 +65,21 @@ FreeBSD distribution sets
 	and the DES sources+binaries.  The DES set contains only
 	crypt(3) code and is subject to U.S.A. export restrictions.
 
-	The binary distribution set can be found in the "binarydist"
+	The binary distribution set can be found in the "bindist"
 	subdirectory of the FreeBSD archive sites.  It consists
-	of files named bin_tgz.aa to bin_tgz.db (i.e., 80 files
+	of files named bin_tgz.aa to bin_tgz.ce (i.e., 57 files
 	all told).  A CKSUMS file (* see note below) is included
 	for verifying the integrity of these.
 
-	The source distribution sets can be found in under
-	"sourcedist" subdirectory of archive sites. It is consists
-	of files named src_tgz.aa to src_tgz.cp (i.e., 68 files
-	all told), plus file CKSUMS*.
+	The source distribution sets can be found in the 
+	"srcdist" subdirectory of archive sites. It is consists
+	of files named base.aa to usrsbin.ae (i.e., 86 files
+	all told), plus the file CKSUMS*.
 
 	Finally, the security distribution set contains
 	usr/src/libcrypt/*, the source files for the DES encryption
 	algorithm, and the binaries which depend on it.  It can
-	be found in the "securedist" subdirectory on sites which
+	be found in the "secrdist" subdirectory on sites which
 	choose to carry the complete FreeBSD distribution.
 
 	The individual files in each collection are no more than
@@ -127,7 +121,7 @@ FreeBSD distribution sets
 System Requirements and Supported Devices:
 ------ ------------ --- --------- -------
 
-FreeBSD 1.0 runs on ISA (AT-Bus) and EISA systems, with 386 and 486
+FreeBSD runs on ISA (AT-Bus) and EISA systems, with 386 and 486
 processors, with or without math coprocessors.  It does NOT support
 Micro-channel systems, such as some IBM PS/2 systems.  The minimal
 configuration includes 4Meg of RAM, and an 80Meg hard disk, but to
@@ -146,10 +140,10 @@ Supported devices include:
 		RLL
 
 	SCSI hard disk controllers:
-		Adaptec 154x series *			[kcopy-ah-floppy]
+		Adaptec 154x series *			[kcopy_ah.flp]
 		Adaptec 174x series
 		Buslogic 545S
-		Bustek 742 (EISA)			[kcopy-bt-floppy]
+		Bustek 742 (EISA)			[kcopy_bt.flp]
 		DTC 3290 in 1542 emulation mode *
 		Ultrastor 14f and 34f
 
@@ -174,7 +168,7 @@ Supported devices include:
 	Ethernet controllers
 		SMC/WD 8003, 8013, and equivalents
 			(including the SMC "Elite" series)
-		Novell NE1000, NE2000
+		Novell NE1000, NE2000, NE2100
 		3COM 3c503
 		ISOLAN ISOLink
 
@@ -199,15 +193,15 @@ Floppy Cntlr.	fd0	0x3f0	6	2
 Std. Hard Disk Cntlr.
 		wd0	0x1f0	14
 
-AHA-154x SCSI Cntlr.	0x330	11	5	 [kcopy-ah-floppy]
+AHA-154x SCSI Cntlr.	0x330	11	5	 [kcopy_ah.flp]
 
-AHA-174x SCSI Cntlr.	automatically configured [kcopy-ah-floppy]
+AHA-174x SCSI Cntlr.	automatically configured [kcopy_ah.flp]
 
-BT742 SCSI Cntlr.	0x330	12		 [kcopy-bt-floppy]
+BT742 SCSI Cntlr.	0x330	12		 [kcopy_bt.flp]
 
 UHA-14f	SCSI Cntlr. or
-UHA-34f SCSI Cntlr.	0x330	14	5        [kcopy-bt-floppy]
-(In FreeBSD GAMMA and before, UHA was on IRQ 11)
+UHA-34f SCSI Cntlr.	0x330	14	5        [kcopy_bt.flp]
+(In FreeBSD 1.0 GAMMA and before, UHA was on IRQ 11)
 
 SCSI Disks	sd[0-2]	automatically configured
 
@@ -234,6 +228,7 @@ replaced with an ed0 device.  The default settings of 9/300 have
 been changed to 5/280.
 
 ISOLAN ISOLink	is0	0x280	10	7
+Novell NE2100	is0	0x280	10	7
 
 QIC-02 Tape	wt0	0x300	5	1
 
@@ -256,9 +251,9 @@ the three installation disks, which don't support a multi-user
 shell.
 
 The full binary distribution  extracts to about 46 MB.
-The full source distribution extracts to about 72 MB.
+The full source distribution extracts to about 86 MB.
 The kernel source only extracts to about 7 MB.
-To recompile the sources requires an additional 55 MB.
+To recompile the sources requires an additional 50 MB.
 To recompile the kernel requires an additional 2 MB.
 
 Since additional room is required for extracting the distributions,
@@ -283,31 +278,31 @@ Installation is supported from several media types, including:
 	Kermit
 
 No matter what you do, however, you'll need at least three disks (1.2M
-or 1.44M) handy, on which you will put the kernel-copy image and the
+or 1.44M) handy, on which you will put the kernel copy image and the
 install (or upgrade) floppy images.
 
 The images are available from the directory "floppies", under the root
-of the FreeBSD/FreeBSD-1.0 tree at your favorite archive site.
+of the FreeBSD/FreeBSD-1.1 tree at your favorite archive site.
 They're available both as raw disk images, and gzipped, to save time
 downloading.
 
 If you are using an AHA-154x or AHA-1742 SCSI host adapter, you need
-the kcopy-ah-floppy image.  If you're using a BT-742 SCSI host adapter
-or an Ultrastor adaptor, then you'll need the kcopy-bt-floppy image.
+the kcopy_ah.flp image.  If you're using a BT-742 SCSI host adapter
+or an Ultrastor adaptor, then you'll need the kcopy_bt.flp image.
 If you're using MFM/RLL/IDE disk controllers, you can use either
-kernel-copy floppy image.
+kernel copy floppy image.
 
 If you are using UNIX to make the floppies, you should use the command
-dd(1) to write the raw floppy images (i.e., kcopy-ah-floppy or
-kcopy-bt-floppy, filesystem-floppy and cpio-floppy) to the floppies.
-For example, to write kcopy-ah-floppy to a 5.25" 1.2 Mb floppy
+dd(1) to write the raw floppy images (i.e., kcopy_ah.flp or
+kcopy_bt.flp, filesyst.flp and cpio.flp) to the floppies.
+For example, to write kcopy_ah.flp to a 5.25" 1.2 Mb floppy
 disk under 386BSD, use:
 
-	$ dd if=kcopy-ah-floppy of=/dev/fd0a bs=30b count=80
+	$ dd if=kcopy_ah.flp of=/dev/fd0a bs=30b count=80
 
 or for a 3.5" 1.44 Mb floppy:
 
-	$ dd if=kcopy-ah-floppy of=/dev/fd0a bs=36b count=80
+	$ dd if=kcopy_ah.flp of=/dev/fd0a bs=36b count=80
 
 If you are using DOS to make the floppies, use the rawrite.exe
 utility.  This can be found in the "tools" subdirectory of the
@@ -518,7 +513,7 @@ The following is a walk-through of the steps necessary to get FreeBSD
 installed on your hard disk.  If you wish to stop the installation, you
 may hit Control-C at any prompt and then type `halt'. 
 
-	Boot from the kcopy-ah or kcopy-bt floppy, depending on
+	Boot from the kcopy_ah or kcopy_bt floppy, depending on
 	your hard disk controller type.
 
 	When prompted to insert the filesystem floppy, remove the
@@ -635,7 +630,7 @@ may hit Control-C at any prompt and then type `halt'.
 
 	Read the message and note which partition (e.g., sd0a or wd0a)
 	you need to copy a kernel to.  Reboot the machine off the
-	kcopy-xx-floppy disk, but this time at the prompt asking
+	kcopy_xx.flp disk, but this time at the prompt asking
 	you to insert a file system floppy, do _not_ replace the
 	floppy, just press <enter>.
 
@@ -658,7 +653,7 @@ may hit Control-C at any prompt and then type `halt'.
 	Once again, this stage can take up to two minutes, so DO NOT
 	PANIC!
 
-	You will be asked to insert the cpio-floppy into a floppy
+	You will be asked to insert the cpio.flp into a floppy
 	drive, and enter that drive's number.  "0" corresponds to
 	DOS's "A:" drive, "1" corresponds to DOS's "B:" drive.
 
@@ -673,7 +668,7 @@ may hit Control-C at any prompt and then type `halt'.
 	binary.  Or if you are using SCSI tape, the dos-floppy should
 	contain the st command.  
 
-	To load the dos-floppy, remove the cpio-floppy from the
+	To load the dos-floppy, remove the cpio.flp from the
 	drive,  insert the dos-floppy and enter a "yes" response
 	at the prompt.  Otherwise, enter "no" at the prompt.
 
@@ -686,8 +681,7 @@ may hit Control-C at any prompt and then type `halt'.
 	CONGRATULATIONS: You now have the minimum base of FreeBSD
 	files on your hard disk!  Now you get to install the
 	distribution file sets.  Remember that, at minimum, you must
-	install the bin.tar.gz.xx file set (see below for
-	instructions).
+	install the bin_tgz.xx file set (see below for instructions).
 
 	After the machine is done booting, you will be presented
 	with a screenful of information about what to do next.
@@ -706,7 +700,7 @@ may hit Control-C at any prompt and then type `halt'.
 		After you have chosen a temporary directory,
 		you should issue the appropriate load command:
 
-			load_fd - for loading from a MS-DOS hard disk 
+			load_dos - for loading from a MS-DOS hard disk 
 				partition, or from floppies,
 			
 			load_qic_tape - for loading from QIC-02 tape, or
@@ -724,7 +718,7 @@ may hit Control-C at any prompt and then type `halt'.
 			# st -f /dev/nrst0 low_dnsty 16
 			# load_scsi_tape
 
-		If loading from floppy or hard disk, the load_fd
+		If loading from floppy or hard disk, the load_dos
 		command prompts for information, such as to which
 		floppy drive or hard disk directory to load from.
 		Additional options are available, e.g., for listing
@@ -734,7 +728,7 @@ may hit Control-C at any prompt and then type `halt'.
 		Go to the directory which contains the first
 		distribution set you wish to install.  This is
 		either the directory you specified above, if using
-		load_fd, or possibly a subdirectory of that
+		load_dos, or possibly a subdirectory of that
 		directory, if you loaded from tape.
 
 		When there, run "set_tmp_dir" again, and choose
@@ -778,7 +772,7 @@ may hit Control-C at any prompt and then type `halt'.
 	To install via FTP or NFS:
 
 		First you must decide on a temporary directory to hold
-		the <set>.tar.gz.xx files. The directory /usr/distrib
+		the <set>.xx files. The directory /usr/distrib
 		is suggested. You should cd to it, if necessary do
 		a mkdir first. Use set_tmp_dir to identify this 
 		directory to the install process.
@@ -860,7 +854,7 @@ may hit Control-C at any prompt and then type `halt'.
 	To install via Kermit:
 
 		First you must decide on a temporary directory to hold
-		the <set>.tar.gz.xx files. The directory /usr/distrib
+		the <set>.xx files. The directory /usr/distrib
 		is suggested. You should cd to it, if necessary do
 		a mkdir first. Use set_tmp_dir to identify this 
 		directory to the install process.
@@ -936,26 +930,20 @@ may hit Control-C at any prompt and then type `halt'.
 Further Tips on Installing FreeBSD
 ------- ---- -- ---------- -------
 
-	You might wish to install the binarydist first, get that
+	You might wish to install the bindist first, get that
 	working, and then at a later point in time have a go at
-	installing the sourcedist. BEFORE YOU REBOOT AFTER INSTALLING
-	THE BINARYDIS, you must preserve the commands that do the
-	extracting. They are kept in the single-user-mode .profile
-	file called /.profile.  Proceed like this:
-
-		mv /.profile /.profile.install
-		ln /root/.profile /.profile
+	installing the sourcedist.
 
 	When you are ready to install the sourcedist at some time
 	in the future, get into multi-user mode (i.e., the normal
-	means of running FreeBSD) and issue these commands:
+	means of running FreeBSD) and issue this command:
 
-		cp /.profile.install /.profile
 		shutdown now
 
-	This will cause the system to go into single-user mode, and
-	the install profile will be active (i.e., you will find the
-	commands load_fd, extract etc available to you again).
+	This will cause the system to go into single-user mode.  To
+	get the install commands active again issue this command:
+
+		. /magic
 
 	If your disk has several operating systems, you may want
 	to install a boot manager such as Thomas Wolfram's os-bs
@@ -1052,4 +1040,4 @@ THANKS FOR USING THIS; that's what makes it all worthwhile.
  as they will end up in our personal mail spools.  We will be
  happy to make other arrangements]
 
-This is $Id: install_notes,v 1.11 1993/10/19 17:33:38 rgrimes Exp $
+This is $Id: install_notes,v 1.13.2.2 1994/05/05 09:08:55 rgrimes Exp $
diff --git a/etc/etc.i386/kc.profile b/etc/etc.i386/kc.profile
index 35028934290d..be4f73f11215 100644
--- a/etc/etc.i386/kc.profile
+++ b/etc/etc.i386/kc.profile
@@ -1,4 +1,4 @@
-# $Header
+#	$Id: kc.profile,v 1.6 1994/02/21 21:52:00 rgrimes Exp $
 #
 # rc for kernel distribution floppy
 
@@ -8,10 +8,7 @@ export PATH
 reboot_it() {
 	echo    ""
 	echo    "halting the machine..."
-	
 	halt
-	sync
-	sync
 	echo "Halt failed!  Try power-cycling the machine..."
 	exit 1
 }
@@ -25,6 +22,8 @@ bail_out() {
 	reboot_it
 }
 
+echo	""
+echo	""
 echo    Enter '"copy"' at the prompt to copy the kernel on this
 echo    floppy to your hard disk.  enter anything else to reboot,
 echo	but wait for the machine to restart to remove the floppy.
@@ -51,32 +50,30 @@ if [ X"$todo" = Xcopy ]; then
 	fsck -y /dev/r$diskpart
 	if [ $? -ne 0 ]; then
 		echo ""
-		echo "fsck failed...  Sorry, can't copy kernel..."
+		echo "fsck failed...  Sorry, can't copy kernel!"
 		bail_out
 	fi
-	echo    ""
-	echo    "mounting $diskpart on /mnt..."
+	echo -n	"Mounting $diskpart on /mnt... "
 	mount /dev/$diskpart /mnt
 	if [ $? -ne 0 ]; then
 		echo ""
-		echo "mount failed...  Sorry, can't copy kernel..."
+		echo "mount failed...  Sorry, can't copy kernel!"
 		bail_out
 	fi
-	echo    ""
-	echo    "Please wait.  Copying kernel..."
+	echo    "done."
+	echo -n	"Copying kernel... "
 	cp /386bsd /mnt/386bsd
 	if [ $? -ne 0 ]; then
-		echo ""
-		echo "Copy failed...  (?!?!?!)"
+		echo "failed...  (?!?!?!)"
 		bail_out
 	fi
-	echo    ""
-	echo    "unmounting $diskpart..."
+	echo    "done."
+	echo -n	"Unmounting $diskpart... "
 	umount /mnt > /dev/null 2>&1
 	if [ $? -ne 0 ]; then
-		echo ""
-		echo "unmount failed...  Shouldn't be a problem..."
+		echo -n "failed...  Shouldn't be a problem... "
 	fi
+	echo "done."
 	bail_out
 fi
 
diff --git a/etc/gettytab b/etc/gettytab
index 29eb925ff748..c0ac99a0da25 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -9,7 +9,7 @@
 # entries, and in cases where getty is called with no table name
 #
 # cb, ce and ck are desirable on most crt's.  The non-crt entries need to
-# be changed to turn them off (ce@:ce@:ck@:).
+# be changed to turn them off (cb@:ce@:ck@:).
 #
 # Parity defaults to even.  There ought to be more alternative entries with
 # no parity.  The Pc entry already has no parity..  The different parities
@@ -46,31 +46,31 @@ default:\
 #	be assigned to any table desired (hopefully the same speed).
 #
 a|std.110|110-baud:\
-	:nd#1:cd#1:uc:sp#110:
+	:np:nd#1:cd#1:uc:sp#110:
 b|std.134|134.5-baud:\
-	:ep:nd#1:cd#2:ff#1:td#1:sp#134:ht:nl:
+	:np:nd#1:cd#2:ff#1:td#1:sp#134:ht:nl:
 1|std.150|150-baud:\
-	:ep:nd#1:cd#2:td#1:fd#1:sp#150:ht:nl:lm=\E\72\6\6\17login\72 :
+	:np:nd#1:cd#2:td#1:fd#1:sp#150:ht:nl:lm=\E\72\6\6\17login\72 :
 c|std.300|300-baud:\
-	:nd#1:cd#1:sp#300:
+	:np:nd#1:cd#1:sp#300:
 d|std.600|600-baud:\
-	:nd#1:cd#1:sp#600:
+	:np:nd#1:cd#1:sp#600:
 f|std.1200|1200-baud:\
-	:fd#1:sp#1200:
+	:np:fd#1:sp#1200:
 6|std.2400|2400-baud:\
-	:sp#2400:
+	:np:sp#2400:
 7|std.4800|4800-baud:\
-	:sp#4800:
+	:np:sp#4800:
 2|std.9600|9600-baud:\
-	:sp#9600:
+	:np:sp#9600:
 g|std.19200|19200-baud:\
-	:sp#19200:
+	:np:sp#19200:
 std.38400|38400-baud:\
-	:sp#38400:
+	:np:sp#38400:
 std.57600|57600-baud:\
-	:sp#57600:
+	:np:sp#57600:
 std.115200|115200-baud:\
-	:sp#115200:
+	:np:sp#115200:
 
 #
 # Dial in rotary tables, speed selection via 'break'
@@ -136,7 +136,7 @@ X|Xwindow|X window system:\
 	:fd@:nd@:cd@:rw:sp#9600:
 
 P|Pc|Pc console:\
-	:np:sp#115200:
+	:ht:np:sp#115200:
 
 #
 # Wierdo special case for fast crt's with hardcopy devices
diff --git a/etc/group b/etc/group
index 900aff8a60aa..5c38d3667727 100644
--- a/etc/group
+++ b/etc/group
@@ -6,10 +6,11 @@ tty:*:4:root
 operator:*:5:root
 bin:*:7:
 news:*:8:
+man:*:9:
 games:*:13:
 staff:*:20:root
 guest:*:31:root
 nobody:*:39:
 ingres:*:74:ingres
-dialer:*:117
+dialer:*:117:
 nogroup:*:32766:
diff --git a/etc/host.conf b/etc/host.conf
index bda52547860f..4c82560a1fa3 100644
--- a/etc/host.conf
+++ b/etc/host.conf
@@ -1,4 +1,7 @@
+# $Id: host.conf,v 1.2 1993/11/07 01:02:57 wollman Exp $
 # Default is to use the nameserver first
 bind
 # If that doesn't work, then try the /etc/hosts file
 hosts
+# If you have YP/NIS configured, uncomment the next line
+# nis
diff --git a/etc/hosts b/etc/hosts
index 29402c5849e9..08645ce9b767 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,13 +1,20 @@
+# $Id: hosts,v 1.2 1993/11/11 22:32:36 wollman Exp $
 #
 # Host Database
 # This file should contain the addresses and aliases
 # for local hosts that share this file.
-# It is used only for "ifconfig" and other operations
-# before the nameserver is started.
+# In the presence of the domain name service or NIS, this file may
+# not be consulted at all; see /etc/host.conf for the resolution order.
 #
 #
-127.1		localhost localhost.my.domain
+127.0.0.1		localhost localhost.my.domain
 #
 # Imaginary network.
-0.2		myname.my.domain myname
-0.3		myfriend.my.domain myfriend
+#0.2		myname.my.domain myname
+#0.3		myfriend.my.domain myfriend
+#
+# NB: 0 is not a valid network number.  PLEASE PLEASE PLEASE do not try
+# to invent your own network numbers but instead get one from your
+# network provider (if any) or from the Internet Registry (ftp to
+# rs.internic.net, directory `/templates').
+#
diff --git a/etc/inetd.conf b/etc/inetd.conf
index be1bf69e9240..12bad1601099 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -39,3 +39,7 @@ kshell	stream	tcp	nowait	root	/usr/libexec/rshd	rshd -k
 #rstatd/1-3	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rstatd	rpc.rstatd
 #rusersd/1-2	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rusersd	rpc.rusersd
 #walld/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rwalld	rpc.rwalld
+#
+# example entry for the pop3 server
+#pop3	stream	tcp	nowait	root	/usr/local/etc/popper	popper
+#
diff --git a/etc/master.passwd b/etc/master.passwd
index 3188ec6b8936..f4c94367502c 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -1,10 +1,11 @@
 root::0:0::0:0:Charlie &:/root:/bin/csh
-toor::0:0::0:0:Bourne-again Superuser:/root:
-daemon:*:1:31::0:0:The devil himself:/root:
+toor:*:0:0::0:0:Bourne-again Superuser:/root:
+daemon:*:1:31::0:0:Owner of many system processes:/root:
 operator:*:2:20::0:0:System &:/usr/guest/operator:/bin/csh
-bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/dev/null
+bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/nonexistent
 games:*:7:13::0:0:Games pseudo-user:/usr/games:
-uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/usr/libexec/uucp/uucico
+man:*:9:9::0:0:Mister Man Pages:/usr/share/man:
+uucp:*:66:1::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
 ingres:*:267:74::0:0:& Group:/usr/ingres:/bin/csh
 falcon:*:32766:31::0:0:Prof. Steven &:/usr/games:/usr/games/wargames
-nobody:*:32767:9999::0:0:Unprivileged user:/nonexistent:/dev/null
+nobody:*:32767:9999::0:0:Unprivileged user:/nonexistent:/nonexistent
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 1f3bd4fc0926..9ff8a52c4b2d 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,6 +1,4 @@
-#	  fs: /usr/local
-#	  by: rgrimes
-#	date: Sun Aug 29 22:56:32 PDT 1993
+#	$Id: BSD.local.dist,v 1.4 1994/02/22 05:43:07 rgrimes Exp $
 #
 
 /set type=file uname=bin gname=bin mode=0755
@@ -53,3 +51,5 @@ man	type=dir uname=bin gname=bin mode=0755
 	..
 	manl	type=dir uname=bin gname=bin mode=0755
 ..
+skel	type=dir uname=bin gname=bin mode=0755
+..
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 9f9aff7a26ac..5d767c825b5a 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,6 +1,4 @@
-#	  fs: /
-#	  by: rgrimes
-#	date: Fri Jul 16 22:24:17 1993
+#	$Id: BSD.root.dist,v 1.10 1994/02/17 03:52:28 rgrimes Exp $
 #
 
 # top-level files are owned by root.wheel
@@ -11,22 +9,27 @@
 sys	type=link size=12 link=usr/src/sys
 
 dev	type=dir
-	fd	type=dir uname=bin gname=bin mode=555
+	fd	type=dir uname=bin gname=bin mode=0555
 	..
 ..
 
 etc	type=dir
+	config	type=dir
+	..
 	mtree	type=dir
 	..
 	namedb	type=dir
 	..
-	uucp	type=dir uname=root gname=wheel mode=755
+	uucp	type=dir uname=root gname=wheel mode=0755
 	..
 ..
 
 mnt	type=dir
 ..
 
+proc	type=dir uname=root gname=wheel mode=0555
+..
+
 root	type=dir
 ..
 
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 5c174538138d..98ec625552d7 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,6 +1,4 @@
-#	  fs: /usr
-#	  by: rgrimes
-#	date: Sun Aug 29 22:56:32 PDT 1993
+#	$Id: BSD.usr.dist,v 1.9.2.1 1994/04/18 03:19:42 rgrimes Exp $
 #
 
 /set type=file uname=bin gname=bin mode=0755
@@ -15,11 +13,19 @@ games	type=dir uname=bin gname=bin mode=0755
 
 /set type=file uname=bin gname=bin mode=0755
 include	type=dir uname=bin gname=bin mode=0755
-	g++	type=dir uname=bin gname=bin mode=0755
+	arpa		type=dir uname=bin gname=bin mode=0755
+	..
+	g++		type=dir uname=bin gname=bin mode=0755
+		gen	type=dir uname=bin gname=bin mode=0755
+		..
 		sys	type=dir uname=bin gname=bin mode=0755
 		..
 	..
-	rpc	type=dir uname=bin gname=bin mode=0755
+	objc		type=dir uname=bin gname=bin mode=0755
+	..
+	protocols	type=dir uname=bin gname=bin mode=0755
+	..
+	rpc		type=dir uname=bin gname=bin mode=0755
 	..
 ..
 
@@ -64,29 +70,50 @@ share	type=dir uname=bin gname=bin mode=0755
 		..
 	..
 
-	groff_font	type=dir uname=bin gname=bin mode=0755
+	/set type=file uname=bin gname=bin mode=0755
+	groff_font			type=dir uname=bin gname=bin mode=0755
+		devX100			type=dir uname=bin gname=bin mode=0755
+		..
+		devX100-12		type=dir uname=bin gname=bin mode=0755
+		..
+		devX75			type=dir uname=bin gname=bin mode=0755
+		..
+		devX75-12		type=dir uname=bin gname=bin mode=0755
+		..
+		devascii		type=dir uname=bin gname=bin mode=0755
+		..
+		devdvi			type=dir uname=bin gname=bin mode=0755
+			generate	type=dir uname=bin gname=bin mode=0755
+			..
+		..
+		devlatin1		type=dir uname=bin gname=bin mode=0755
+		..
+		devps			type=dir uname=bin gname=bin mode=0755
+			generate	type=dir uname=bin gname=bin mode=0755
+			..
+		..
 	..
 
 	/set type=file uname=bin gname=bin mode=0755
 	man	type=dir uname=bin gname=bin mode=0755
-		cat1	type=dir uname=bin gname=bin mode=0755
+		cat1	type=dir uname=man gname=bin mode=0755
 		..
-		cat2	type=dir uname=bin gname=bin mode=0755
+		cat2	type=dir uname=man gname=bin mode=0755
 		..
-		cat3	type=dir uname=bin gname=bin mode=0755
+		cat3	type=dir uname=man gname=bin mode=0755
 		..
-		cat4	type=dir uname=bin gname=bin mode=0755
-			i386	type=dir uname=bin gname=bin mode=0755
+		cat4	type=dir uname=man gname=bin mode=0755
+			i386	type=dir uname=man gname=bin mode=0755
 			..
 		..
-		cat5	type=dir uname=bin gname=bin mode=0755
+		cat5	type=dir uname=man gname=bin mode=0755
 		..
-		cat6	type=dir uname=bin gname=bin mode=0755
+		cat6	type=dir uname=man gname=bin mode=0755
 		..
-		cat7	type=dir uname=bin gname=bin mode=0755
+		cat7	type=dir uname=man gname=bin mode=0755
 		..
-		cat8	type=dir uname=bin gname=bin mode=0755
-			i386	type=dir uname=bin gname=bin mode=0755
+		cat8	type=dir uname=man gname=bin mode=0755
+			i386	type=dir uname=man gname=bin mode=0755
 			..
 		..
 		man1	type=dir uname=bin gname=bin mode=0755
@@ -131,8 +158,18 @@ share	type=dir uname=bin gname=bin mode=0755
 	tabset	type=dir uname=bin gname=bin mode=0755
 	..
 	tmac	type=dir uname=bin gname=bin mode=0755
+		mm	type=dir uname=bin gname=bin mode=0755
+		..
 	..
 	zoneinfo	type=dir uname=bin gname=bin mode=0755
+		Africa		type=dir uname=bin gname=bin mode=0555
+		..
+		America		type=dir uname=bin gname=bin mode=0555
+		..
+		Asia		type=dir uname=bin gname=bin mode=0555
+		..
+		Atlantic	type=dir uname=bin gname=bin mode=0555
+		..
 		Australia	type=dir uname=bin gname=bin mode=0555
 		..
 		Brazil		type=dir uname=bin gname=bin mode=0555
@@ -141,15 +178,77 @@ share	type=dir uname=bin gname=bin mode=0755
 		..
 		Chile		type=dir uname=bin gname=bin mode=0555
 		..
+		Europe		type=dir uname=bin gname=bin mode=0555
+		..
+		Indian		type=dir uname=bin gname=bin mode=0555
+		..
 		Mexico		type=dir uname=bin gname=bin mode=0555
 		..
+		Pacific		type=dir uname=bin gname=bin mode=0555
+		..
 		SystemV		type=dir uname=bin gname=bin mode=0555
 		..
 		US		type=dir uname=bin gname=bin mode=0555
 		..
 		posix		type=dir uname=bin gname=bin mode=0555
+			Africa		type=dir uname=bin gname=bin mode=0555
+			..
+			America		type=dir uname=bin gname=bin mode=0555
+			..
+			Asia		type=dir uname=bin gname=bin mode=0555
+			..
+			Atlantic	type=dir uname=bin gname=bin mode=0555
+			..
+			Australia	type=dir uname=bin gname=bin mode=0555
+			..
+			Brazil		type=dir uname=bin gname=bin mode=0555
+			..
+			Canada		type=dir uname=bin gname=bin mode=0555
+			..
+			Chile		type=dir uname=bin gname=bin mode=0555
+			..
+			Europe		type=dir uname=bin gname=bin mode=0555
+			..
+			Indian		type=dir uname=bin gname=bin mode=0555
+			..
+			Mexico		type=dir uname=bin gname=bin mode=0555
+			..
+			Pacific		type=dir uname=bin gname=bin mode=0555
+			..
+			SystemV		type=dir uname=bin gname=bin mode=0555
+			..
+			US		type=dir uname=bin gname=bin mode=0555
+			..
 		..
 		right		type=dir uname=bin gname=bin mode=0555
+			Africa		type=dir uname=bin gname=bin mode=0555
+			..
+			America		type=dir uname=bin gname=bin mode=0555
+			..
+			Asia		type=dir uname=bin gname=bin mode=0555
+			..
+			Atlantic	type=dir uname=bin gname=bin mode=0555
+			..
+			Australia	type=dir uname=bin gname=bin mode=0555
+			..
+			Brazil		type=dir uname=bin gname=bin mode=0555
+			..
+			Canada		type=dir uname=bin gname=bin mode=0555
+			..
+			Chile		type=dir uname=bin gname=bin mode=0555
+			..
+			Europe		type=dir uname=bin gname=bin mode=0555
+			..
+			Indian		type=dir uname=bin gname=bin mode=0555
+			..
+			Mexico		type=dir uname=bin gname=bin mode=0555
+			..
+			Pacific		type=dir uname=bin gname=bin mode=0555
+			..
+			SystemV		type=dir uname=bin gname=bin mode=0555
+			..
+			US		type=dir uname=bin gname=bin mode=0555
+			..
 		..
 	..
 ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 10b01b9db3ec..1646c9da0716 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,9 +1,17 @@
-#	  fs: /
-#	  by: rgrimes
-#	date: Fri Jul 16 22:24:17 1993
+#	$Id: BSD.var.dist,v 1.9 1994/02/15 10:38:50 rgrimes Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
+account
+..
+/set type=dir uname=root gname=wheel mode=0755
+at
+	jobs
+	..
+	spool
+	..
+..
+/set type=dir uname=bin gname=bin mode=0755
 backups
 ..
 crash
diff --git a/etc/namedb/named.boot b/etc/namedb/named.boot
index 93db30859e22..d9c4adedddf2 100644
--- a/etc/namedb/named.boot
+++ b/etc/namedb/named.boot
@@ -1,9 +1,11 @@
-;	@(#)named.boot	5.1 (Berkeley) 6/30/90
+;	$Id: named.boot,v 1.2 1993/11/07 00:58:34 wollman Exp $
+;	From: @(#)named.boot	5.1 (Berkeley) 6/30/90
 
 ; boot file for secondary name server
 ; Note that there should be one primary entry for each SOA record.
 
-sortlist 128.3.0.0
+; example sortlist config:
+; sortlist 128.3.0.0
 
 directory	/etc/namedb
 
diff --git a/etc/namedb/root.cache b/etc/namedb/root.cache
index d24fa4549c42..d60ff1584d3b 100644
--- a/etc/namedb/root.cache
+++ b/etc/namedb/root.cache
@@ -1,22 +1,23 @@
 ;	@(#)root.cache	5.1 (Berkeley) 6/30/90
 
 ; Initial cache data for root domain servers.
-.			IN	NS	NS.NIC.DDN.MIL.
-			IN	NS	A.ISI.EDU.
-			IN	NS	AOS.BRL.MIL.
+.			IN	NS	NS.INTERNIC.NET.
+			IN	NS	AOS.ARL.ARMY.MIL.
+			IN	NS	KAVA.NISC.SRI.COM.
 			IN	NS	C.NYSER.NET.
-			IN	NS	GUNTER-ADAM.AF.MIL.
-			IN	NS	NS.NASA.GOV.
 			IN	NS	TERP.UMD.EDU.
+			IN	NS	NS.NASA.GOV.
+			IN	NS	NIC.NORDU.NET.
+			IN	NS	NS.NIC.DDN.MIL.
 
 ; Prep the cache (hotwire the addresses).  Order does not matter.
-NS.NIC.DDN.MIL		IN	A	192.67.67.53
-A.ISI.EDU		IN	A	26.3.0.103
-			IN	A	128.9.0.107
-AOS.BRL.MIL		IN	A	128.20.1.2
+NS.NIC.DDN.MIL.		IN	A	192.112.36.4
+AOS.ARL.ARMY.MIL.	IN	A	128.63.4.82
 			IN	A	192.5.25.82
+KAVA.NISC.SRI.COM.	IN	A	192.33.33.24
 C.NYSER.NET.		IN	A	192.33.4.12
-GUNTER-ADAM.AF.MIL.	IN	A	26.1.0.13
+TERP.UMD.EDU.		IN	A	128.8.10.90
+NS.INTERNIC.NET.	IN	A	198.41.0.4
 NS.NASA.GOV.		IN	A	128.102.16.10
 			IN	A	192.52.195.10
-TERP.UMD.EDU.		IN	A	128.8.10.90
+NIC.NORDU.NET.		IN	A	192.36.148.17
diff --git a/etc/netstart b/etc/netstart
index 36c5df3c9db0..a078218a76ba 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,10 +1,14 @@
 #!/bin/sh -
 #
-#	@(#)netstart	5.9 (Berkeley) 3/30/91
+#	$Id: netstart,v 1.8.2.3 1994/05/04 08:57:11 rgrimes Exp $
+#	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 routedflags=-q
 timedflags=NO
+xntpdflags="NO"
+ntpdate="NO"
 rwhod=NO
+sendmail_flags="-bd -q30m"
 #kerberos_server=YES
 #nfs_server=YES
 #name_server=YES
@@ -16,11 +20,18 @@ rwhod=NO
 hostname=`cat /etc/myname`
 hostname $hostname
 
-# ifconfig we0 inet $hostname netmask 447-ether
-# ifconfig ne0 inet $hostname netmask my-netmask
-# ifconfig ec0 inet $hostname netmask my-netmask
-# ifconfig is0 inet $hostname netmask my-netmask
-# ifconfig ed0 inet $hostname netmask my-netmask
+if [ -e /etc/hostname.ed0 ]; then
+	ifconfig ed0 `cat /etc/hostname.ed0`
+fi
+if [ -e /etc/hostname.ed1 ]; then
+	ifconfig ed1 `cat /etc/hostname.ed1`
+fi
+if [ -e /etc/hostname.ie0 ]; then
+	ifconfig ie0 `cat /etc/hostname.ie0`
+fi
+if [ -e /etc/hostname.is0 ]; then
+	ifconfig is0 `cat /etc/hostname.is0`
+fi
 
 # set the address for the loopback interface
 ifconfig lo0 inet localhost
diff --git a/etc/phones b/etc/phones
index b18806b83389..c6ab472d9951 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,5 @@
-#	@(#)phones	5.2 (Berkeley) 6/30/90
+#	$Id: phones,v 1.4 1994/01/24 00:39:01 rgrimes Exp $
+#	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
 # see tip(1), phones(5)
diff --git a/etc/protocols b/etc/protocols
index 8db17cf5d585..1b9129c5aba3 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,11 +1,17 @@
 #
 # Internet (IP) protocols
 #
-#	@(#)protocols	5.1 (Berkeley) 4/17/89
+#	$Id: protocols,v 1.2 1993/11/07 00:31:22 wollman Exp $
+#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
+#
+# Updated for FreeBSD based on RFC 1340, Assigned Numbers (July 1992).
 #
 ip	0	IP		# internet protocol, pseudo protocol number
 icmp	1	ICMP		# internet control message protocol
+igmp	2	IGMP		# Internet Group Management
 ggp	3	GGP		# gateway-gateway protocol
+ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
+st	5	ST		# ST datagram mode
 tcp	6	TCP		# transmission control protocol
 egp	8	EGP		# exterior gateway protocol
 pup	12	PUP		# PARC universal packet protocol
@@ -13,3 +19,10 @@ udp	17	UDP		# user datagram protocol
 hmp	20	HMP		# host monitoring protocol
 xns-idp	22	XNS-IDP		# Xerox NS IDP
 rdp	27	RDP		# "reliable datagram" protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4
+xtp	36	XTP		# Xpress Tranfer Protocol
+idpr-cmtp	39	IDPR-CMTP	# IDPR Control Message Transport
+vmtp	81	VMTP		# Versatile Message Transport
+ospf	89	OSPFIGP		# Open Shortest Path First IGP
+ipip	94	IPIP		# Yet Another IP encapsulation
+encap	98	ENCAP		# Yet Another IP encapsulation
diff --git a/etc/rc b/etc/rc
index 85715719de71..ee1b96427d73 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,6 @@
-#	@(#)rc	5.27 (Berkeley) 6/5/91
+#!/bin/sh
+#	$Id: rc,v 1.19.2.2 1994/04/18 04:14:19 rgrimes Exp $
+#	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -61,16 +63,21 @@ umount -a >/dev/null 2>&1
 mount -a -t nonfs
 rm -f /fastboot		# XXX (root now writeable)
 
+# If the machine runs wall CMOS clock (compatible with MSDOS),
+# activate following line by creating empty file /etc/wall_cmos_clock
+# If this file not exist, following line does nothing (assumed
+# the machine runs UTC CMOS clock). See adjkerntz(8) for details.
+adjkerntz -i
+
 # set hostname, turn on network
 echo 'starting network'
 . /etc/netstart
 
-mount -a -t nfs >/dev/null 2>&1 &	# XXX shouldn't need background
-
 # clean up left-over files
 rm -f /etc/nologin
 rm -f /var/spool/uucp/LCK.*
 rm -f /var/spool/uucp/STST/*
+# don't add .[a-z]* to rm, because of .adjkerntz file
 (cd /var/run && { rm -rf -- *; cp /dev/null utmp; chmod 644 utmp; })
 
 echo -n 'starting system logger'
@@ -109,27 +116,41 @@ then
 	'password file may be incorrect -- /etc/ptmp exists'
 fi
 
+# Recover elvis editor files.
 echo preserving editor files
-(cd /var/tmp && /usr/libexec/elvispreserve "-the system rebooted" elvis* &&
-     rm -f elvis[0-9a-f][0-9a-f][0-9a-f][0-9a-f]* \
-	 elvis_[0-9a-f][0-9a-f][0-9a-f][0-9a-f]*)
+(cd /var/tmp && /usr/libexec/elvispreserve "-the system rebooted" elv* &&
+	rm -f elvis[0-9a-f][0-9a-f][0-9a-f][0-9a-f]* \
+	elvis_[0-9a-f][0-9a-f][0-9a-f][0-9a-f]*)
+
+# Recover vi editor files.
+virecovery=/var/tmp/vi.recover/recover.*
+if [ "$virecovery" != "/var/tmp/vi.recover/recover.*" ]; then
+	echo 'Recovering vi editor sessions'
+	for i in $virecovery; do
+		sendmail -t < $i
+	done
+fi
 
 echo clearing /tmp
 
 # prune quickly with one rm, then use find to clean up /tmp/[lq]*
 # (not needed with mfs /tmp, but doesn't hurt there...)
 (cd /tmp && rm -rf [a-km-pr-zA-Z]* &&
-    find . ! -name . ! -name lost+found ! -name quotas -exec rm -rf -- {} \;)
+    find -d . ! -name . ! -name lost+found ! -name quotas -exec rm -rf -- {} \;)
 
 # echo 'turning on accounting';	accton /var/account/acct
 
 echo -n standard daemons:
-echo -n ' update';		update
-echo -n ' crond';		/usr/libexec/crond
+echo -n ' cron';		cron
 echo '.'
 
 echo -n starting network daemons:
 
+# Portmapper should always be run, to provide RPC services for inetd.
+if [ -x /usr/sbin/portmap ]; then
+	echo -n ' portmap';		portmap
+fi
+
 # $gated and $routedflags are imported from /etc/netstart.
 # If $gated == YES, gated is used; otherwise routed.
 # If $routedflags == NO, routed isn't run.
@@ -143,6 +164,24 @@ if [ X${name_server} = X"YES" -a -r /etc/named.boot ]; then
 	echo -n ' named';		named
 fi
 
+# $ntpdate and $xntpdflags are imported from /etc/netstart.
+# If $ntpdate != NO, run ntpdate $ntpdate to set the date correctly.
+# If $xntpdflags != NO, start xntpd.
+if [ X"${ntpdate}" != X"NO" ]; then
+	echo ' ntpdate';	ntpdate $ntpdate
+fi
+
+if [ X"${xntpdflags}" != X"NO" ]; then
+	if [ X"${tickadjflags}" != X"NO" ]; then
+		echo 'adjusting kernel for xntpd'; tickadj ${tickadjflags--A}
+	fi
+	echo 'starting xntpd';	xntpd ${xntpdflags}
+fi
+
+if [ X"${ntpdate}" != X"NO" -o X"${xntpdflags}" != X"NO" ]; then
+	echo -n 'starting more network daemons:'
+fi
+
 # $rwhod is imported from /etc/netstart;
 # if $rwhod is set to something other than NO, rwhod is run.
 if [ ${rwhod-NO} != "NO" ]; then
@@ -151,18 +190,35 @@ fi
 
 echo -n ' printer';		lpd
 
-
 if [ X${nfs_server} = X"YES" -a -r /etc/exports ]; then
-	echo -n ' portmap';		portmap
 	echo -n ' mountd';		mountd
 	echo -n ' nfsd';		nfsd -u 0,0,4 -t 0,0
 	echo -n ' nfsiod';		nfsiod 4
 fi
 
-echo -n ' sendmail';		sendmail -bd -q30m
+# $sendmail_flags is imported from /etc/netstart;
+# if $sendmail_flags is something other than NO, sendmail is run.
+if [ X"${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
+	echo -n ' sendmail';		sendmail ${sendmail_flags} 
+fi
+
 echo -n ' inetd';		inetd
 echo '.'
 
+mount -a -t nfs >/dev/null 2>&1 &	# XXX shouldn't need background
+
+# Make shared lib searching a little faster.  Leave /usr/lib first if you
+# add your own entries or you may come to grief.
+if [ -x /sbin/ldconfig ]; then
+	_LDC=/usr/lib
+	if [ -d /usr/X11R6/lib ]; then _LDC="${_LDC} /usr/X11R6/lib" ; fi
+	if [ -d /usr/X386/lib ]; then _LDC="${_LDC} /usr/X386/lib" ; fi
+	if [ -d /usr/local/lib ]; then _LDC="${_LDC} /usr/local/lib" ; fi
+	if [ -d /usr/gnu/lib ]; then _LDC="${_LDC} /usr/gnu/lib" ; fi
+	echo 'setting ldconfig path:' ${_LDC}
+	ldconfig ${_LDC}
+fi
+
 sh /etc/rc.local
 
 date
diff --git a/etc/remote b/etc/remote
index 0b5cc592f678..a860a2666db7 100644
--- a/etc/remote
+++ b/etc/remote
@@ -24,9 +24,9 @@ omen|Omen BBS:\
 	:pn=@:tc=dos1200:
 
 # UNIX system definitions
-unix1200|1200 Baud dial-out to another UNIX system:\
+unix1200|1200 Baud dial-out to a UNIX system:\
 	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial1200:
-unix300|300 Baud dial-out to another UNIX system:\
+unix300|300 Baud dial-out to a UNIX system:\
 	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial300:
 
 # DOS system definitions
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index d6f049569f53..4be076b98eeb 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,9 +1,12 @@
+#	$Id: dot.cshrc,v 1.9 1994/02/21 20:35:58 rgrimes Exp $
+#
 alias mail Mail
 set history=1000
-set path=(/sbin /usr/sbin /bin /usr/bin /usr/local/bin .)
+set savehist=1000
+set path=(/sbin /usr/sbin /bin /usr/bin /usr/local/bin)
 
 # directory stuff: cdpath/cd/back
-set cdpath=(/sys /usr/src/{bin,sbin,usr.{bin,sbin},lib,libexec,share,contrib,etc,games,gnu,include,})
+set cdpath=(/sys/{i386,} /usr/src/{bin,sbin,usr.{bin,sbin},lib,libexec,share,contrib,etc,games,gnu,include,})
 alias	cd	'set old=$cwd; chdir \!*'
 alias	h	history
 alias	j	jobs -l
@@ -21,5 +24,6 @@ alias	tset	'set noglob histchars=""; eval `\tset -s \!*`; unset noglob histchars
 
 if ($?prompt) then
 	set prompt="`hostname -s`# "
+	set filec
 endif
 setenv BLOCKSIZE K
diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
index 8de6b57c626d..b6a2ac7174ad 100644
--- a/etc/root/dot.klogin
+++ b/etc/root/dot.klogin
@@ -1,2 +1,4 @@
+#	$Id: dot.klogin,v 1.2 1994/02/21 20:36:01 rgrimes Exp $
+#
 user1.root@your.realm.wherever
 user2.root@your.realm.wherever
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 424dce8653d6..def29c181a80 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,3 +1,5 @@
+#	$Id: dot.login,v 1.4 1994/02/21 20:36:02 rgrimes Exp $
+#
 tset -Q \?$TERM
 stty crt erase ^\?
 umask 2
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index 1479c6fba5d0..a817750a3df0 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,7 +1,10 @@
+#	$Id: dot.profile,v 1.4 1994/02/21 20:36:03 rgrimes Exp $
+#
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:.
 echo 'erase ^?, kill ^U, intr ^C'
 stty crt erase  kill  intr 
 export PATH
 HOME=/root
 export HOME
+TERM=pc3
 export TERM
diff --git a/etc/security b/etc/security
index c06e54faee36..76d5a6c7173c 100644
--- a/etc/security
+++ b/etc/security
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)security	5.3 (Berkeley) 5/28/91
-#	$Id: security,v 1.4 1993/10/25 20:13:16 rgrimes Exp $
+#	$Id: security,v 1.6 1994/01/22 10:54:13 rgrimes Exp $
 #
 PATH=/sbin:/bin:/usr/bin
 
@@ -21,22 +21,11 @@ echo "checking setuid files and devices:"
 #
 MP=`mount -t ufs | sed 's;/dev/;&r;' | awk '{ print $3 }'`
 set $MP
-ls -lgT `while test $# -ge 1; do
+while test $# -ge 1; do
 	mount=$1
 	shift
 	find $mount -xdev -perm -u+s -or -perm -g+s | sort
-done` > $TMP
-
-#MP=`mount -t ufs | sed 's;/dev/;&r;' | awk '{ print $1 " " $3 }'`
-#set $MP
-#ls -lgT `while test $# -ge 2; do
-#	device=$1
-#	shift
-#	mount=$1
-#	shift
-#	ncheck -s $device | sed -e "/:$/d" -e "/\/dev\//d" \
-#	    -e "s;[^/]*;$mount;" -e "s;//;/;g" | sort
-#done` > $TMP
+done | xargs -n 20 ls -lgTd > $TMP
 
 if cmp $LOG/setuid.today $TMP >/dev/null; then :; else
 	echo "$host setuid/device diffs:"
diff --git a/etc/services b/etc/services
index cd7509f1bfcc..040b814c7343 100644
--- a/etc/services
+++ b/etc/services
@@ -1,8 +1,16 @@
 #
 # Network services, Internet style
 #
-#	@(#)services	5.8 (Berkeley) 5/9/91
+# Note that it is presently the policy of IANA to assign a single well-known
+# port number for both TCP and UDP; hence, most entries here have two entries
+# even if the protocol doesn't support UDP operations.
+# Updated from RFC 1340, ``Assigned Numbers'' (July 1992).  Not all ports
+# are included, only the more common ones.
 #
+#	$Id: services,v 1.5.2.1 1994/03/06 08:43:38 rgrimes Exp $
+#	From: @(#)services	5.8 (Berkeley) 5/9/91
+#
+tcpmux		1/tcp		# TCP port service multiplexer
 echo		7/tcp
 echo		7/udp
 discard		9/tcp		sink null
@@ -12,11 +20,16 @@ daytime		13/tcp
 daytime		13/udp
 netstat		15/tcp
 qotd		17/tcp		quote
+msp		18/tcp		# message send protocol
+msp		18/udp		# message send protocol
 chargen		19/tcp		ttytst source
 chargen		19/udp		ttytst source
 ftp		21/tcp
+# 22 - unassigned
 telnet		23/tcp
+# 24 - private
 smtp		25/tcp		mail
+# 26 - unassigned
 time		37/tcp		timserver
 time		37/udp		timserver
 rlp		39/udp		resource	# resource location
@@ -25,30 +38,84 @@ whois		43/tcp		nicname
 domain		53/tcp		nameserver	# name-domain server
 domain		53/udp		nameserver
 mtp		57/tcp				# deprecated
-# Bootp experimental (sellgren@vangogh)
-bootp		67/udp				# bootp server
-#bootpc		68/udp				# bootp client
-#
+bootps		67/tcp		# BOOTP server
+bootps		67/udp
+bootpc		68/tcp		# BOOTP client
+bootpc		68/udp
 tftp		69/udp
+gopher		70/tcp		# Internet Gopher
+gopher		70/udp
 rje		77/tcp		netrjs
 finger		79/tcp
+www		80/tcp		http	# WorldWideWeb HTTP
+www		80/udp			# HyperText Transfer Protocol
 link		87/tcp		ttylink
+#kerberos	88/tcp		krb5	# Kerberos v5
+#kerberos	88/udp
 supdup		95/tcp
+# 100 - reserved
 hostnames	101/tcp		hostname	# usually from sri-nic
-tsap		102/tcp				# part of ISODE.
-#csnet-cs	105/?
-pop		109/tcp		postoffice
+iso-tsap	102/tcp		tsap		# part of ISODE.
+csnet-ns	105/tcp		cso-ns	# also used by CSO name server
+csnet-ns	105/udp		cso-ns
+rtelnet		107/tcp		# Remote Telnet
+rtelnet		107/udp
+pop2		109/tcp		postoffice	# POP version 2
+pop2		109/udp
+pop3		110/tcp		# POP version 3
+pop3		110/udp
 sunrpc		111/tcp
 sunrpc		111/udp
 auth		113/tcp		authentication
 sftp		115/tcp
 uucp-path	117/tcp
 nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
+ntp		123/tcp
 ntp		123/udp				# Network Time Protocol
-snmp		161/udp
-snmp-trap	162/udp
+netbios-ns	137/tcp				# NETBIOS Name Service
+netbios-ns	137/udp
+netbios-dgm	138/tcp				# NETBIOS Datagram Service
+netbios-dgm	138/udp
+netbios-ssn	139/tcp				# NETBIOS session service
+netbios-ssn	139/udp
+imap2		143/tcp				# Interim Mail Access Proto v2
+imap2		143/udp
+snmp		161/udp				# Simple Net Mgmt Proto
+snmp-trap	162/udp		snmptrap	# Traps for SNMP
+cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
+cmip-man	163/udp
+cmip-agent	164/tcp
+cmip-agent	164/udp
+xdmcp		177/tcp				# X Display Mgr. Control Proto
+xdmcp		177/udp
+nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
+nextstep	178/udp		NeXTStep NextStep	# server
+bgp		179/tcp				# Border Gateway Proto.
+bgp		179/udp
+prospero	191/tcp				# Cliff Neuman's Prospero
+prospero	191/udp
+irc		194/tcp				# Internet Relay Chat
+irc		194/udp
+smux		199/tcp				# SNMP Unix Multiplexer
+smux		199/udp
+at-rtmp		201/tcp				# AppleTalk routing
+at-rtmp		201/udp
+at-nbp		202/tcp				# AppleTalk name binding
+at-nbp		202/udp
+at-echo		204/tcp				# AppleTalk echo
+at-echo		204/udp
+at-zis		206/tcp				# AppleTalk zone information
+at-zis		206/udp
+z3950		210/tcp		wais		# NISO Z39.50 database
+z3950		210/udp		wais
+ipx		213/tcp				# IPX
+ipx		213/udp
+imap3		220/tcp				# Interactive Mail Access
+imap3		220/udp				# Protocol v3
+ulistserv	372/tcp				# UNIX Listserv
+ulistserv	372/udp
 #
-# UNIX specific services
+# Berkeley-specific services
 #
 exec		512/tcp
 biff		512/udp		comsat
@@ -59,7 +126,7 @@ syslog		514/udp
 printer		515/tcp		spooler		# line printer spooler
 talk		517/udp
 ntalk		518/udp
-route		520/udp		router routed
+route		520/udp		router routed	# RIP
 timed		525/udp		timeserver
 tempo		526/tcp		newdate
 courier		530/tcp		rpc
@@ -68,10 +135,38 @@ netnews		532/tcp		readnews
 netwall		533/udp				# -for emergency broadcasts
 uucp		540/tcp		uucpd		# uucp daemon
 remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
-
+#klogin		543/tcp				# Kerberized `rlogin' (v5)
+#kshell		544/tcp				# Kerberized `rsh' (v5)
+kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+#
+webster		765/tcp				# Network dictionary
+webster		765/udp
+#
+# From ``Assigned Numbers'':
+#
+#> The Registered Ports are not controlled by the IANA and on most systems
+#> can be used by ordinary user processes or programs executed by ordinary
+#> users.
+#
+#> Ports are used in the TCP [45,106] to name the ends of logical
+#> connections which carry long term conversations.  For the purpose of
+#> providing services to unknown callers, a service contact port is
+#> defined.  This list specifies the port used by the server process as its
+#> contact port.  While the IANA can not control uses of these ports it
+#> does register or list uses of these ports as a convienence to the
+#> community.
+#
 ingreslock	1524/tcp
+ingreslock	1524/udp
+prospero-np	1525/tcp		# Prospero non-privileged
+prospero-np	1525/udp
+rfe		5002/tcp		# Radio Free Ethernet
+rfe		5002/udp		# Actually uses UDP only
+#
 #
 # Kerberos (Project Athena/MIT) services
+# Note that these are for Kerberos v4, and are unofficial.  Sites running
+# v4 should uncomment these and comment out the v5 entries above.
 #
 kerberos	750/udp		kdc	# Kerberos (server) udp
 kerberos	750/tcp		kdc	# Kerberos (server) tcp
@@ -80,3 +175,6 @@ kpasswd		761/tcp		kpwd	# Kerberos "passwd"
 klogin		543/tcp			# Kerberos rlogin
 eklogin		2105/tcp		# Kerberos encrypted rlogin
 kshell		544/tcp		krcmd	# Kerberos remote shell
+#
+supfilesrv	871/tcp			# for SUP
+supfiledbg	1127/tcp		# for SUP
diff --git a/etc/syslog.conf b/etc/syslog.conf
index 56f157692c0c..73d56b70a784 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -2,6 +2,7 @@
 *.notice;kern.debug;lpr,auth.info;mail.crit	/var/log/messages
 mail.info					/var/log/maillog
 lpr.info					/var/log/lpd-errs
+cron.*						/var/cron/log
 *.err						root
 *.notice;auth.debug				root
 *.alert						root
diff --git a/etc/ttys b/etc/ttys
index dd243013c413..20fda7f79126 100644
--- a/etc/ttys
+++ b/etc/ttys
@@ -3,11 +3,18 @@
 #
 # name	getty				type	status		comments
 #
-console	"/usr/libexec/getty Pc"	pc3	on secure
+ttyv0	"/usr/libexec/getty Pc"		pc3	on  secure
+# Virtual terminals
+ttyv1	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv2	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv3	"/usr/libexec/getty Pc"		cons25	off secure
+# Hardwired terminals
 tty00	"/usr/libexec/getty std.9600"	unknown	off secure
 tty01	"/usr/libexec/getty std.9600"	unknown	off secure
-tty02	"/usr/libexec/getty std.9600"	unknown	off secure
-tty03	"/usr/libexec/getty std.9600"	unknown	off secure
+# Dialin terminals
+ttyd2   "/usr/libexec/getty std.9600"   unknown off secure
+ttyd3   "/usr/libexec/getty std.9600"   unknown off secure
+# Pseudo terminals
 ttyp0	none			network
 ttyp1	none			network
 ttyp2	none			network