Major PicoBSD update by luigi with some debugging help from myself.

. Now builds on -STABLE (-CURRENT is broken due to bugs)
. etc directory contents centralized instead of in each
  type directory (can exclude & override as desired)
. Removed extraneous language files (lang files for rc really necessary?)
. dialog-based build tool with support for custom floppy builds
. MFS image loads as a mfs_root module instead of compiled into kernel

THIS IS BROKEN ON CURRENT.  I'll MFC to -STABLE immediately following.
luigi tells me I have an OK from jkh on the MFC.

Submitted by:	luigi

142 files changed, 873 insertions, 3611 deletions

diff --git a/release/picobsd/README.luigi b/release/picobsd/README.luigi
new file mode 100644
index 000000000000..5a3a333344ff
--- /dev/null
+++ b/release/picobsd/README.luigi
@@ -0,0 +1,151 @@
+In this file i try to document the overall architecture of PicoBSD
+source tree.
+
+    build/
+	directory containing main build scripts and makefiles.
+	build:	main build script
+	stage1:	invoked by build
+	clean:	to clean up previous compilations
+	Makefile.conf
+		makefile to edit config file and build kernel
+
+    floppy.tree/
+	default files to fill the floppy and mfs trees.
+	Can be overridden by listing files to be removed in
+	${TYPE}/floppy.tree.exclude, and putting files to be replaced
+	in ${TYPE}/floppy.tree/
+
+    doc/
+	documentation (unchanged from original)
+
+    forth/
+	load files for the boot loader (unchanged from original)
+
+    help/
+	help files in various languages. The suffix is the two letter
+	country code for the language. Currently only .en and .pl
+	used.
+
+    tinyware/
+	various small programs used instead of the corresponding
+	full-blown utilities.
+
+    tools/
+	couple of tools used during the build process.
+
+    dial, isp, net, router, custom ...
+	directories containing the source and config files for the
+	various image types.
+
+
+Structure of each image type is as follows:
+
+    Makefile.mfs
+	makefile used to build/populate the MFS
+
+    PICOBSD
+	kernel config file
+
+    crunch1/
+	directory with crunched config etc (unchanged from original)
+
+    floppy.tree/
+	local files to be put into the floppy/mfs trees.
+
+    floppy.tree.exclude
+	list of files in the default floppy.tree/ not to be copied
+	for this configuration (used by tar --exclude-from
+	floppy.tree.exclude)
+
+    lang/
+	language-dependant files (trimmed from the original one)
+
+    mfs.mtree
+	mtree structure used to populate the mfs image
+	MFS image, or on the floppy image in various phases.1G
+
+----
+
+Below a partly incomplete list of files used by the various
+picobsd types.
+
+Files for various systems
+
+=  base file
+x  missing
+X  missing, not needed with oinit
+D  different
+d  minor difference, merge candidate
+L  copied from LANG directory
+G  generated in stage3
+
+DIAL ISP  NET  ROUT  MY1  MY2  	File in floppy.tree
+------------------------------------------------------
+ =    =    =    =               boot.config
+ x    =    =    =               disktab
+ x    =    x    x               etc/firewall
+ =    =    =    =               etc/fstab
+ =    =    =    =               etc/gettytab
+ =    =    =    =               etc/group
+ =    =    =    =               etc/host.conf
+ L    L    L    L             L etc/hosts
+ x    =    =    x               etc/inetd.conf
+ =    =    =    =               etc/login.conf
+ d    =    =    x               etc/master.passwd
+ d    =    =    D               etc/mfs.rc
+ L    L    L    L             L etc/motd
+ D    =    =    =               etc/ppp/ppp.conf
+ =    x    x    x               etc/ppp/ppp.conf.template
+ =    =    =    =               etc/ppp/ppp.deny
+ d    =    =    =               etc/ppp/ppp.linkup
+ =    =    =    =               etc/ppp/ppp.secret.sample
+ =    =    =    =               etc/profile
+ =    =    =    =               etc/protocols
+ D    =    d    D               etc/rc
+ D    =    =    X               etc/rc.conf
+ x    =    =    D               etc/rc.firewall
+ =    =    =    D               etc/rc.network
+ x    =    =    D               etc/rc.serial
+ x    =    =    =               etc/remote
+ L    =    =    X             L etc/resolv.conf
+ =    =    =    =               etc/services
+ x    =    =    =               etc/shells
+ x    =    =    x               etc/snmpd.conf
+ =    x    x    x             G etc/spwd.db
+ =    x    x    x               etc/ssh_config
+ =    =    =    =               etc/termcap
+ D    =    =    =               etc/ttys
+ =    =    =    =               kernel.config
+ =    =    =    =             G kernel.gz
+
+DIAL ISP  NET  ROUT  MY1  MY2  	File in lang
+                                README.en
+				README.pl
+				boot.help.en
+				boot.help.pl
+				hosts.en
+				hosts.pl
+				mfs.rc.en	to floppy.tree
+				mfs.rc.pl
+				motd.en
+				motd.pl
+				rc.conf.en	to floppy.tree
+				rc.conf.pl	via
+				rc.en		to floppy.tree
+				rc.network.en	to floppy.tree
+				rc.network.pl	via
+				rc.pl		via
+				reboot.en
+				reboot.pl
+				resolv.conf.en	to floppy.tree
+				resolv.conf.pl	via
+				update.en
+				update.pl
+
+
+DIAL ISP  NET  ROUT  MY1  MY2  	File in mfs.tree
+
+ D    =    d    d               Makefile
+ =    x    x    x               login.conf
+ D    =    D    D               mfs.tree
+
diff --git a/release/picobsd/net/conf/Makefile b/release/picobsd/build/Makefile.conf
index 06f74873e7a8..15e308ad4ba4 100644
--- a/release/picobsd/net/conf/Makefile
+++ b/release/picobsd/build/Makefile.conf
@@ -1,10 +1,12 @@
-# $Id: Makefile,v 1.3 1998/10/15 21:40:02 abial Exp $
+# $Id: Makefile,v 1.4 1999/01/14 23:20:09 abial Exp $
 #
+# Makefile for building PICOBSD kernels
 
 SRC?=/usr/src
 CONF?=$(SRC)/sys/i386/conf
 
-CONFFILE=PICOBSD${suffix}.${SIZE}
+#CONFFILE=PICOBSD${suffix}.${SIZE}
+CONFFILE=PICOBSD${suffix}
 COMPILE=$(SRC)/sys/compile/$(CONFFILE)
 KERNFILE=$(COMPILE)/kernel
 
@@ -13,7 +15,7 @@ all: $(KERNFILE)
 $(KERNFILE): PICOBSD
 	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
 	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
+#	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
diff --git a/release/picobsd/build/build b/release/picobsd/build/build
index 0ba02e43b88d..8172a717383c 100755
--- a/release/picobsd/build/build
+++ b/release/picobsd/build/build
@@ -3,391 +3,313 @@
 #
 #	$Id: build,v 1.12.2.1 1999/02/22 21:25:15 abial Exp $
 #
-
 # You can set the SRC variable which points to your source tree. It's
 # /usr/src by default (most people shouldn't change it).
 SRC=/usr/src
 
-# Default MFS sizes for different types of the floppy. Again, most people
-# shouldn't change them unless they know what they are doing.
+# --------- YOU SHOULD NOT NEED TO CHANGE ANYTHING BELOW -----------
+# The "build" script will ask you for parameters. Just run it... :-)
+# --------- YOU SHOULD NOT NEED TO CHANGE ANYTHING BELOW -----------
+
+# EDITOR is the editor you use
+EDITOR=${EDITOR:-vi}
+# LANGUAGE     language to be used (en or pl)
+LANGUAGE=en
+# TYPE         PicoBSD type (isp, router, net, custom)
+TYPE=${1:-dial}
+# SITE         site-specific files
+SITE=
 
-DIAL_DFLT_SIZE=1600
-ROUTER_DFLT_SIZE=820
-NET_DFLT_SIZE=1700
-ISP_DFLT_SIZE=1700
+# FLOPPY_SIZE  floppy size in KB (default to 1440)
+FLOPPY_SIZE=1440
 
 # DEVFS is currently broken. Always set this.
 #
 NO_DEVFS=yes
 
-# Path to srcdirs of special program for init(8) (standard if empty)
-INIT=
-
-# --------- YOU SHOULD NOT NEED TO CHANGE ANYTHING BELOW -----------
-# The "build" script will ask you for parameters. Just run it... :-)
-# --------- YOU SHOULD NOT NEED TO CHANGE ANYTHING BELOW -----------
+# RISU is where dialog replies go.
+RISU=.build.reply
 
+# abort in case of error...
 set -e
 
 # Build kernel with previously set parameters.
 
-build_kernel() {
-	echo ""
-	echo "-> Checking if we have to build the PICOBSD kernel..."
-	(cd ../${TYPE}/conf; make)
-	echo ""
-}
+# assign default values to variables.
 
-# Main build procedure. It calls other scripts (stage1-3 and populate)
-main() {
+set_defaults() {
 
-if [ "${TYPE}" = "dial" ]
-then
-	suffix="-D"
-fi
-if [ "${TYPE}" = "net" ]
-then
-	suffix="-N"
-fi
-if [ "${TYPE}" = "isp" ]
-then
-	suffix="-I"
-fi
-if [ "${TYPE}" = "router" ]
-then
-	suffix="-R"
-fi
-if [ "${TYPE}" = "custom" ]
-then
-	suffix="-C"
-fi
-export suffix
-
-clear
-echo "-> Building with following parameters:"
-echo -n "	Type:     ${TYPE}"
-if [ "X${INIT}" != "X" ]
-then
-	echo " (using ${INIT} as init(8))"
-else
-	echo ""
-fi
-echo "	MFS size: ${SIZE} kB"
-echo "	Language: ${LANGUAGE}"
-echo ""
-echo "-> We'll use the sources living in ${SRC}"
-echo ""
-echo "-> I hope you have checked the ../${TYPE}/conf/PICOBSD config file..."
-echo ""
-echo ""
-sleep 2
-
-# Build the kernel, if necessary
-build_kernel
-
-export SIZE LANGUAGE TYPE SRC NO_DEVFS INIT
-
-for i in stage1 populate stage2 stage3
-do
-	echo "====================== ${i} started ====================="
-	./${i}
-	if [ "X$?" != "X0" ]
-	then
-		echo ""
-		echo "-> ERROR in \"${i}\" script. Aborting the build process."
-		echo -n "-> Cleaning temporary files... "
-		umount -f /mnt
-		vnconfig -u /dev/rvn0
-		./clean ${TYPE}
-		echo "Done."
-		exit 10
-	else
-	echo "==================== ${i} completed ====================="
+    while read name suff sz init mfs_in floppy_in ; do
+	if [ "$name" != "#" -a $name != "" ] ; then
+	    eval ${name}_suffix=$suff
+	    eval ${name}_DFLT_SIZE=$sz
+	    eval ${name}_INIT=$init
+	    eval ${name}_MFS_INODES=$mfs_in
+	    eval ${name}_FLOPPY_INODES=$floppy_in
 	fi
-done
+    done <<__eof__
+# build	MFS		- Byte/inode -
+# name		suffix	DFLT_SZ	init	MFS	FLOPPY
+dial		-D	1600	init	4096	32768
+router		-R	820	oinit	3072	32768
+net		-N	2200	init	4096	32768
+isp		-I	2400	init	4096	32768
+custom		-C	2400	init	8192	32768
+__eof__
 }
 
-# check for existing custom config directory and ask user if they want to use it
+set_msgs() {
+    MSG1="Type: ${TYPE}"
+    if [ "X${TYPE}" = "Xcustom" ] ; then
+	MSG1="${MSG1} (from ${CUST_DIR})"
+    fi
 
-check_for_old_custom() {
-       KEEP_CUSTOM=no
-       if [ ! -d ../custom ]
-       then
-               return
-       fi
-       clear
-       echo "                   Custom directory setup"
-       echo ""
-       echo "There is an existing custom configuration linked to"
-       ls -l ../custom | awk -F\> '{ print $2 }' | awk '{ print $1 }'
-       echo ""
-       read -p "Do you wish to use the existing custom directory? (yes/no): " KEEP_CUSTOM
-}
-
-# Ask for, and set the custom config directory
-
-set_custom() {
-	clear
-	echo "                   Custom directory setup"
-	echo ""
-	echo "Please enter the full path to the directory containing your"
-	echo "custom setup."
-	echo "This directory tree must be laid out exactly like the standard"
-	echo "ones. (E.g. you can type in /home/abial/work/custom, which"
-	echo "should contain conf/, crunch1/, floppy.tree/, lang/, mfs.tree/)."
-	echo ""
-	read -p "Enter the custom directory: " CUST_DIR
-	if [ "X${CUST_DIR}" = "X" ]
-	then
-		echo "-> Error. Custom directory cannot be null!"
-		exit 1
-	fi
+    MSG="PicoBSD build -- Current parameters:\n\n\t1.  ${MSG1}\n\
+\t2.  MFS size: ${SIZE} kB\n\t3.  Language: ${LANGUAGE}\n\
+\t4.  Site-info: ${SITE}\n"
 }
 
-# Set the LANGUAGE variable
-
-set_lang() {
-	clear
-	echo "                    Language setup"
-	echo ""
-	echo "Language can be either 'en' (English - default) or 'pl' (Polish)"
-	echo ""
-	read -p "Enter the LANGUAGE (en, pl): " LANGUAGE
-	if [ "X${LANGUAGE}" = "X" ]
-	then
-		LANGUAGE=en
-	fi
-}
 
-# Set the INIT variable
+# Main build procedure. It calls another scripts (stage1)
+main() {
 
-set_init() {
-	clear
-	echo "                Choose your init(8) program"
-	echo ""
-	echo "You can choose either standard init(8) (which requires getty), or"
-	echo "you can choose 'oinit' from TinyWare collection."
-	echo ""
-	read -p "Enter the INIT (init, oinit): " INIT
-	if [ "X${INIT}" = "Xinit" ]
-	then
-		unset INIT
-	fi
+    export suffix
+
+    clear
+    set_msgs
+    printf "${MSG}"
+    echo "-> We'll use the sources living in ${SRC}"
+    echo ""
+    echo "-> I hope you have checked the ../${TYPE}/PICOBSD config file..."
+    echo ""
+    echo ""
+    sleep 2
+
+    export SIZE LANGUAGE TYPE SRC NO_DEVFS INIT
+    export SITE MFS_INODES FLOPPY_INODES FLOPPY_SIZE
+
+    # Build the kernel, if necessary
+    echo ""
+    echo "-> Checking if we have to build the PICOBSD kernel..."
+    (cd ../${TYPE}; make -f ../build/Makefile.conf )
+    echo ""
+
+    ./stage1
+    if [ "X$?" != "X0" ] ; then
+	echo ""
+	echo "-> ERROR in \"${i}\" script. Aborting the build process."
+	echo -n "-> Cleaning temporary files... "
+	umount -f /mnt
+	vnconfig -u /dev/rvn0
+	./clean ${TYPE}
+	echo "Done."
+	exit 10
+    fi
+    echo "==================== ${i} completed ====================="
 }
 
-# Set the default MFS size depending on the type of setup
+# check for existing custom config directory and ask user if they want to use it
 
-set_dflt_size() {
-	echo ""
-	if [ "X${TYPE}" = "X" ]
-	then
-		TYPE=dial
-	fi
-	echo "Setting default MFS size for \"${TYPE}\" type floppy."
-	if [ "X${TYPE}" = "Xdial" ]
-	then
-		SIZE=$DIAL_DFLT_SIZE
-	elif [ "X${TYPE}" = "Xnet" ]
-	then
-		SIZE=$NET_DFLT_SIZE
-	elif [ "X${TYPE}" = "Xrouter" ]
-	then
-		SIZE=$ROUTER_DFLT_SIZE
-	elif [ "X${TYPE}" = "Xisp" ]
-	then
-		SIZE=$ISP_DFLT_SIZE
-	elif [ "X${TYPE}" = "Xcustom" ]
-	then
-		SIZE=$DIAL_DFLT_SIZE
-	else
-		echo "Unknown type of setup: \"${TYPE}\". Aborting..."
-		exit 10
-	fi
+check_for_old_custom() {
+   KEEP_CUSTOM=no
+   if [ ! -d ../custom ] ; then
+       return
+   fi
+   clear
+   echo "                   Custom directory setup"
+   echo ""
+   echo "There is an existing custom configuration linked to"
+   ls -l ../custom | awk -F\> '{ print $2 }' | awk '{ print $1 }'
+   echo ""
+   read -p "Do you wish to use the existing custom directory? (yes/no): " KEEP_CUSTOM
 }
 
-# Set MFS size interactively
+# Ask for, and set the custom config directory
 
-set_size() {
-	clear
-	echo "            Memory Filesystem (MFS) Size setup"
-	echo ""
-	echo " Size can be anything decent (usually 1700 or 2500) in kB."
-	echo " NOTE1: you can also use other numbers (e.g. 1500, 1456, 1789 ...)"
-	echo " even much bigger (like 4567), but keep in mind that this memory is"
-	echo " totally lost to other programs. Usually you want to keep this as small as"
-	echo " possible."
-	echo ""
-	echo " NOTE2: for pre-canned setups there are specific requirements:"
-	echo "	dial   - requires at least SIZE=$DIAL_DFLT_SIZE"
-	echo "	router - requires at least SIZE=$ROUTER_DFLT_SIZE (500kB less without SNMP)"
-	echo "	net    - requires at least SIZE=$NET_DFLT_SIZE (500kB less without SNMP)"
-	echo "	isp    - requires at least SIZE=$ISP_DFLT_SIZE (500kB less without SNMP)"
-	echo ""
-	echo " The last two configurations are not likely to run reliably on machines"
-	echo " with less than 10MB of RAM, while the 'dial' is tested and proved to run"
-	echo " as many as ~30 processes on 10 consoles with only 8MB RAM. YMMV."
-	echo ""
-	read -p "Enter the SIZE in kB: " SIZE
-	if [ "X${SIZE}" = "X" ]
-	then
-		set_dflt_size
-	fi
+set_custom() {
+    dialog --title "Custom directory setup" --inputbox \
+    "Please enter the full path to the directory containing your \
+    custom setup. \
+    This directory tree must be laid out exactly like the standard \
+    ones. (E.g. you can type in /home/abial/work/custom, which \
+    should contain crunch1/, floppy.tree/, lang/ )." \
+    10 70 2> ${RISU}
+    CUST_DIR=`cat ${RISU}`
 }
 
-# Set type of floppy interactively
+# Set type of floppy interactively. Also set the various defaults
+# associated to each type. We can override them manually afterwards.
 
 set_type() {
-	clear
-	echo "               Setup the type of configuration"
-	echo ""
-
-	echo " Type can be either 'dial', 'router', 'net' or 'isp'. There are four"
-	echo " sets of configuration files in subdirs ../dial, ../router, ../net"
-	echo " and ../isp respectively - the contents of the floppy is constructed"
-	echo " basing on the Makefiles and scripts in them."
-	echo ""
-	echo " You can also type in 'custom', and you'll be asked to enter the"
-	echo " full path to directory tree, where you stored your custom"
-	echo " configuration, laid out exactly like the standard ones. (E.g."
-	echo " you can type in /home/abial/work/custom, which should contain"
-	echo " conf/, crunch1/, floppy.tree/, lang/, mfs.tree/)."
-	echo ""
-	echo " If you define TYPE=dial, you'll end up having a floppy which is"
-	echo " suitable for dialup access and not much else. If you define TYPE=net,"
-	echo " you'll have a small router-fixit-like floppy, which lacks most"
-	echo " interactive tools. TYPE=isp gives you a dialin server floppy."
-	echo ""
-	read -p "Enter the TYPE of the floppy (dial, net, router, isp): " TYPE
-	if [ "X${TYPE}" = "X" ]
-	then
-		TYPE=dial
-	fi
-	if [ "X${TYPE}" = "Xrouter" ]
-	then
-		INIT=oinit
-	fi
-        if [ "X${TYPE}" = "Xcustom" ]
-        then
-                check_for_old_custom
-                if [ "X${KEEP_CUSTOM}" != "Xyes" ]
-                then
-                        [ -r ../custom ] && rm -f ../custom
-                        set_custom
-                        (cd ..; ln -sf ${CUST_DIR} custom)
-                fi
+
+    eval SIZE=$"${TYPE}_DFLT_SIZE"
+    eval INIT=$"${TYPE}_INIT"
+    eval MFS_INODES=$"${TYPE}_MFS_INODES"
+    eval FLOPPY_INODES=$"${TYPE}_FLOPPY_INODES"
+    eval suffix=$"${TYPE}_suffix"
+
+    case ${TYPE} in
+    custom)
+	check_for_old_custom
+	if [ "X${KEEP_CUSTOM}" != "Xyes" ] ; then
+	    [ -r ../custom ] && rm -f ../custom
+	    set_custom
+	    (cd ..; ln -sf ${CUST_DIR} custom)
         fi
-	if [ "X${TYPE}" = "Xdial" -a "X${INIT}" = "X" ]
-	then
-		set_init
-	fi
+	;;
+    esac
 	
-	set_dflt_size
-}
-
-put_title() {
-	clear
-	echo "                     Building the PicoBSD v. 0.4 floppy"
-	echo "============================================================================"
-	echo ""
 }
 
-
 #-------------------------------------------------------------------
 # Main entry of the script
 
+set_defaults
+set_type
+
 # If $1="package", it creates a neat set of floppies
 
-if [ X"$1" = X"package" ]
-then
-	touch build.status
-	echo "##############################################" >>build.status
-	echo "## `date` ">>build.status
-	echo "##############################################" >>build.status
-	./clean dial
-	for y in en pl
-	do
-		for z in dial router net isp
-		do
-			TYPE=${z}
-			LANGUAGE=${y}
-			set_dflt_size
-			echo "---------------------------------------------">>build.status
-			echo "Building TYPE=${z}, LANGUAGE=${y}, SIZE=${SIZE}" >>build.status
-			export TYPE SIZE LANGUAGE SRC NO_DEVFS INIT
-			main
-			if [ "X$?" != "X0" ]
-			then
-				echo "	** FAILED! **">>build.status
-			else
-				echo "	(ok)">>build.status
-			fi
-			mv picobsd.bin pb_${y}${suffix}.bin
-			echo "Calling ./clean for ${TYPE}, ${LANGUAGE}, ${SIZE}">>build.status
-			./clean ${TYPE}
-		done
+if [ X"$1" = X"package" ] ; then
+    shift
+    touch build.status
+    echo "##############################################" >>build.status
+    echo "## `date` ">>build.status
+    echo "##############################################" >>build.status
+    ./clean dial
+    for y in en pl ; do
+	for z in dial router net isp ; do
+	    TYPE=${z}
+	    LANGUAGE=${y}
+	    set_type
+	    echo "---------------------------------------------">>build.status
+	    echo "Building TYPE=${z}, LANGUAGE=${y}, SIZE=${SIZE}" >>build.status
+	    main
+	    if [ "X$?" != "X0" ] ; then
+		echo "	** FAILED! **">>build.status
+	    else
+		echo "	(ok)">>build.status
+	    fi
+	    mv picobsd.bin pb_${y}${suffix}.bin
+	    echo "Calling ./clean for ${TYPE}, ${LANGUAGE}, ${SIZE}">>build.status
+	    ./clean ${TYPE}
 	done
-	exit 0
+    done
+    exit 0
 fi
 
 # Set build parameters interactively
 
-TYPE=dial
-LANGUAGE=en
-set_dflt_size
-while [ "X${ans}" != "Xn" ]
-do
-	put_title
-	echo "Current build parameters are as follows:"
-	echo ""
-	echo "	1.	Type:     ${TYPE}"
-	if [ "X${INIT}" != "X" ]
-	then
-		echo "		a. (using ${INIT} as init(8))"
-	else
-		echo "		a. (using stock init as init(8))"
+while [ "X${ans}" != "Xn" ] ; do
+    set_msgs
+    dialog --menu "PicoBSD build menu -- ver 0.44 (20aug1999)" 19 70 12 \
+	1 "${MSG1}" \
+	a "init type: ${INIT}" \
+	e "edit kernel config file for ${TYPE}" \
+	c "edit crunch.conf file for ${TYPE}" \
+	2 "MFS size: ${SIZE}kB" \
+	3 "Language: ${LANGUAGE}" \
+	4 "Site-info: ${SITE}" \
+	5 "Floppy size: ${FLOPPY_SIZE}kB" \
+	6 "MFS bytes per inode: ${MFS_INODES}" \
+	7 "UFS bytes per inode: ${FLOPPY_INODES}" \
+	n "no change, build it" q "quit" 2> ${RISU}
+    ans=`cat ${RISU}`
+    case ${ans} in
+    1)
+	dialog --menu "Setup the type of configuration" 12 70 5 \
+	    dial "dialin (ppp etc.)" \
+	    router "router/bridge/mrouter" \
+	    net "net admin tool" \
+	    isp "isp (ppp and terminal server)" \
+	    custom "custom config (need pathname)" 2> ${RISU}
+	if [ $? = 0 ]; then
+	    TYPE=`cat ${RISU}`
+	    set_type
+	fi
+	;;
+    a)
+	dialog --menu "Choose your init(8) program" \
+	10 70 2 init "Standard init (requires getty)" \
+	oinit "small init from TinyWare" 2> ${RISU}
+	if [ "$?" = "0" ]; then
+	    INIT=`cat ${RISU}`
 	fi
-	echo ""
-	echo "	2.	MFS size: ${SIZE} kB"
-	echo "	3.	Language: ${LANGUAGE}"
-	echo ""
-	echo "Which parameter would you like to change?"
-	read -p "(1, a, 2, 3; n -no change, build it ; q -quit): " ans
-	case ${ans} in
-	1)	set_type
-		clear
-		;;
-	a)	set_init
-		clear
-		;;
-	2)	set_size
-		clear
-		;;
-	3)	set_lang
-		clear
-		;;
-	q)	echo ""
-		echo "Hey! Don't give up so quickly. Quitting for now..."
-		echo ""
-		exit 0
-		;;
-	n)	;;
-	*)	echo "Unknown option \"${ans}\". Try again."
-		sleep 2
-		clear
-		;;
-	esac
+	;;
+
+    e) ${EDITOR} ../${TYPE}/PICOBSD ;;
+    c) ${EDITOR} ../${TYPE}/crunch1/crunch.conf ;;
+    2) dialog --title "MFS Size setup" --inputbox \
+"MFS size depends on what you need to put on the MFS image. Typically \
+ranges between 800kB (for very small bridge/router images) to \
+as much as 2500kB kB for a densely packed image. \
+Keep in mind that this memory is \
+totally lost to other programs. Usually you want to keep \
+this as small as possible. " 10 70 2> ${RISU}
+	SIZE=`cat ${RISU}`
+	if [ "X${SIZE}" = "X" ] ; then
+	    eval SIZE=${TYPE}_DFLT_SIZE
+	fi
+	;;
+    3)      dialog --menu "Please choose language" \
+	10 40 2 en English pl Polish 2> ${RISU}
+	LANGUAGE=`cat ${RISU}`
+	;;
+    4) dialog --title "Site info setup" --inputbox \
+	"Please enter the full path to the directory \
+	containing site-specific setup. \
+	This directory tree must contain files that replace \
+	standard ones in floppy.tree/ and mfs.tree/ . " \
+	10 70 2> ${RISU}
+	SITE=`cat ${RISU}`
+	;;
+    5) dialog --menu "Set floppy size" 15 70 4 \
+		1440 "1.44MB" 1720 "1.72MB" \
+		2880 "2.88MB" 4096 "4MB" 2> ${RISU}
+	FLOPPY_SIZE=`cat ${RISU}`
+	;;
+    6) dialog --title "MFS bytes per inode:" --inputbox \
+	"Enter MFS bytes per inode (typically 4096..65536). \
+	A larger value means fewer inodes but more space on MFS" \
+	10 70 2> ${RISU}
+	MFS_INODES=`cat ${RISU}`
+	;;
+    7) dialog --title "Floppy bytes per inode:" --inputbox \
+	"Enter floppy bytes per inode (typically 3072..65536). \
+	A larger value means fewer inodes but more space on the floppy." \
+	10 70 2> ${RISU}
+	FLOPPY_INODES=`cat ${RISU}`
+	;;
+    n) ;;
+    q) exit 0 ;;
+    *) echo "Unknown option \"${ans}\". Try again."
+	sleep 2
+	clear
+	;;
+    esac
 done
-# Export the parameters
-export LANGUAGE SIZE TYPE SRC NO_DEVFS INIT
+
 # Call the build procedure
 main
 # Install if it's ok.
 echo ""
-if [ "X$?" = "X0" ]
-then
-	echo "The build process was completed successfuly."
-	echo ""
-	echo "Now we are going to install the image on the floppy."
-	./install
+if [ "X$?" = "X0" ] ; then
+FILENAME=picobsd.bin
+    echo "The build process was completed successfuly."
+    echo ""
+    echo "Now we are going to install the image on the floppy."
+    echo "Please insert a blank floppy in /dev/fd0."
+    echo "WARNING: the contents of the floppy will be permanently erased!"
+    echo "Your options:"
+    echo "	* ^C to abort,"
+    echo "	* Enter to install \"${FILENAME}\","
+    echo "	* name of other file to install."
+    echo ""
+    read -p "Your choice: " junk
+    if [ "X${junk}" != "X" ] ; then
+	FILENAME=${junk}
+    fi
+    echo "Writing ${FILENAME}..."
+    dd if=${FILENAME} of=/dev/rfd0
+    echo "Done."
 fi
 exit 0
diff --git a/release/picobsd/build/clean b/release/picobsd/build/clean
index 9ba009fcbf3c..217686bc7627 100755
--- a/release/picobsd/build/clean
+++ b/release/picobsd/build/clean
@@ -1,7 +1,7 @@
 #! /bin/sh -
 
 #
-#	$Id: clean,v 1.7 1998/10/15 21:39:58 abial Exp $
+#	$Id: clean,v 1.7.2.1 1999/02/05 12:15:00 abial Exp $
 #
 set -e
 
diff --git a/release/picobsd/build/install b/release/picobsd/build/install
deleted file mode 100755
index a45003171390..000000000000
--- a/release/picobsd/build/install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-#
-#	$Id: install,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
-#
-FILENAME=picobsd.bin
-
-echo "Please insert a blank floppy in /dev/fd0."
-echo "WARNING: the contents of the floppy will be permanently erased!"
-echo "Your options:"
-echo "	* ^C to abort,"
-echo "	* Enter to install \"${FILENAME}\","
-echo "	* name of other file to install."
-echo ""
-read -p "Your choice: " junk
-if [ "X${junk}" != "X" ]
-then
-	FILENAME=${junk}
-fi
-echo "Writing ${FILENAME}..."
-dd if=${FILENAME} of=/dev/rfd0
-echo "Done."
diff --git a/release/picobsd/build/populate b/release/picobsd/build/populate
deleted file mode 100755
index 67f16a78b006..000000000000
--- a/release/picobsd/build/populate
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-#	$Id: populate,v 1.8.2.4 1999/05/07 10:02:30 abial Exp $
-#
-
-. ../Version
-
-pwd=`pwd`
-
-echo "-> Populating MFS tree..."
-cd ../${TYPE}/mfs.tree
-make
-if [ X"${NO_DEVFS}" != X"" ]
-then
-	make devnodes
-fi
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while making \"${TYPE}\" hierarchy in /mnt..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-if [ "${TYPE}" = "router" ]
-then
-	cat ../lang/mfs.rc.${LANGUAGE}| \
-		sed -e "s/@VER@/${VER}/g" > \
-		/mnt/etc/oinit.rc
-else
-	cat ../lang/mfs.rc.${LANGUAGE} | \
-		sed -e "s/@VER@/${VER}/g" > \
-		/mnt/etc/rc
-	cp ../../dial/mfs.tree/login.conf /mnt/etc/login.conf
-	cat ../lang/README.${LANGUAGE} | \
-		sed -e "s/@VER@/${VER}/g" > \
-		/mnt/README
-fi
-cp ../lang/update.${LANGUAGE} /mnt/stand/update
-if [ "${TYPE}" = "dial" ]
-then
-	cp ../lang/reboot.${LANGUAGE} /mnt/stand/reboot
-	ln -f /mnt/stand/reboot /mnt/stand/shutdown
-	cp ../lang/login.${LANGUAGE} /mnt/stand/login
-	cp ../lang/dialup.${LANGUAGE} /mnt/stand/dialup
-	(cd ../../help;\
-	rm -rf tmp_hlp;\
-	mkdir tmp_hlp;\
-	for i in `ls *.hlp.${LANGUAGE}`;\
-	do \
-		cp $i tmp_hlp/`basename $i .hlp.${LANGUAGE}`;\
-	done;\
-	cd tmp_hlp;\
-	ar -cru help.a *;\
-	cp help.a /mnt/help.a)
-fi
-
-echo "-> Making and installing crunch1..."
-cd ../crunch1
-make "SRC=${SRC}" && make install 2>&1 >/dev/null
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while building ../${TYPE}/crunch1..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-
-cd ${pwd}
-
-(echo "-> Fixing permissions"; cd /mnt; chown -R root *)
diff --git a/release/picobsd/build/stage1 b/release/picobsd/build/stage1
index c440b7e018a3..7b781e26a8f1 100755
--- a/release/picobsd/build/stage1
+++ b/release/picobsd/build/stage1
@@ -1,26 +1,51 @@
 #! /bin/sh -
 
+#	$Id$
 #
-#	$Id: stage1,v 1.7 1999/01/19 23:02:05 abial Exp $
-#
+# stage1 -- this script fills the mfs for the picobsd kernel
 
-set -e
+. ../Version
 
-if [ ! -f ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel ]; then
-	echo "-> ERROR: you must build PICOBSD${suffix}.${SIZE} first"
-	exit 1
-fi
+set -e	# abort in case of untested errors
+
+# fail errno errcode
+# is the function used to trap errors and print msgs
+#
+fail() {
+    errno=$1
+    errcode=$2
+    echo "--> Error $errno code $errcode"
+    case $errcode in
+    no_vnconfig)
+	echo "Error while doing vnconfig of fs.PICOBSD on /dev/rvn0..."
+	echo "   Most probably your running kernel doesn't have the vn(4) device."
+	;;
+    disklabel)
+	echo "Error while labeling fs.PICOBSD size $SIZE"
+	;;
+    no_mount)
+	echo "Error while mounting fs.PICOBSD (/dev/vn0c) on /mnt"
+	;;
+    mtree)
+	echo "Error while making hierarchy in /mnt"
+	;;
+    makedevs)
+	echo "Error while making devices in /mnt"
+	;;
+    crunch)
+	echo "Error while building ../${TYPE}/crunch1..."
+	;;
+    vnconfig2)
+	echo "Error while doing vnconfig of floppy.img on /dev/rvn0..."
+	;;
+    disklabel)
+	echo "Error while doing disklabel on of floppy.img size $FLOPPY_SIZE"
+	;;
+    esac
+    echo "-> Aborting $0"
+    exit 10
+}
 
-echo "-> Preparing kernel..."
-cp -p ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel kernel
-#if [ "${TYPE}" != "dial" ]
-#then
-#	echo "-> Preparing kvm database..."
-#	mv /var/db/kvm_kernel.db /var/db/old.db
-#	kvm_mkdb kernel
-#	cp /var/db/kvm_kernel.db kvm_kernel.db
-#	mv /var/db/old.db /var/db/kvm_kernel.db
-#fi
 
 echo "-> Preparing MFS filesystem..."
 umount /dev/vn0 2> /dev/null || true
@@ -30,64 +55,217 @@ vnconfig -u /dev/rvn0 2> /dev/null || true
 dd of=fs.PICOBSD if=/dev/zero count=${SIZE} bs=1k 2> /dev/null
 
 awk 'BEGIN {printf "%c%c", 85, 170}' | \
-                dd of=fs.PICOBSD obs=1 seek=510 conv=notrunc  2> /dev/null
+    dd of=fs.PICOBSD obs=1 seek=510 conv=notrunc  2> /dev/null
 
-vnconfig -s labels -c /dev/rvn0 fs.PICOBSD 2>/dev/null
-#vnconfig -c /dev/rvn0 fs.PICOBSD 2>/dev/null
-if [ "X$?" != "X0" ]
-then
-	echo "-> Error while doing vnconfig of fs.PICOBSD on /dev/rvn0..."
-	echo "   Most probably your running kernel doesn't have the vn(4) device."
-	echo "-> Aborting $0"
-	exit 10
-fi
+vnconfig -s labels -c /dev/rvn0 fs.PICOBSD 2>/dev/null || fail $? no_vnconfig
 
 dd if=/boot/boot1 of=fs.PICOBSD conv=notrunc 2> /dev/null
 
-# This command does weird things on 2.2.x systems. In such case use normal
-# disktype here instead
-if [ "${TYPE}" != "router" ]
-then
-	disklabel -rw vn0 auto
+# This command does weird things on 2.2.x systems.
+# For small image sizes, use std disktypes
+if [ ${SIZE} -lt 1024 ] ; then
+	disklabel -rw /dev/rvn0 fd${SIZE} || fail $? disklabel
 else
-	if [ ${SIZE} -lt 1024 ]
-	then
-		disklabel -rw /dev/rvn0 fd${SIZE}
-	else
-		disklabel -rw vn0 auto
-	fi
+	disklabel -rw vn0 auto || fail $? disklabel
 fi
-if [ "X$?" != "X0" ]
-then
-	echo "-> Error while labeling fs.PICOBSD (vn0)..."
-	echo "-> Aborting $0"
-	exit 10
+
+newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
+mount /dev/vn0c /mnt || fail $? no_mount
+
+pwd=`pwd`
+
+echo "-> Populating MFS tree..."
+cd ../${TYPE}
+make -f Makefile.mfs || fail $? mtree
+if [ X"${NO_DEVFS}" != X"" ] ; then
+	make -f Makefile.mfs devnodes || fail $? makedevs
 fi
 
-# Default setting for other (custom) setups.
-INODES=4096
-# You can save some space on MFS if you don't want so many inodes...
-if [ "${TYPE}" = "dial" ]
-then
-	INODES=4096
+# MY_ETC contains files which override the global config in DEFAULT_ETC
+
+if [ -f floppy.tree/etc/mfs.rc ] ; then
+    MFS_RC=floppy.tree/etc/mfs.rc
+else
+    MFS_RC=../floppy.tree/etc/mfs.rc
+fi
+if [ "${INIT}" = "oinit" ] ; then
+    cat ${MFS_RC} | sed -e "s/@VER@/${VER}/g" > /mnt/etc/oinit.rc
+else
+    cat ${MFS_RC} | sed -e "s/@VER@/${VER}/g" > /mnt/etc/rc
+    if [ -f floppy.tree/etc/mfs.login.conf ] ; then
+	cp floppy.tree/etc/mfs.login.conf /mnt/etc/login.conf
+    else
+	cp ../floppy.tree/etc/mfs.login.conf /mnt/etc/login.conf
+    fi
+    cat lang/README.${LANGUAGE} | sed -e "s/@VER@/${VER}/g" > /mnt/README
 fi
-if [ "${TYPE}" = "router" ]
-then
-	INODES=3072
+cp lang/update.${LANGUAGE} /mnt/stand/update
+if [ "${TYPE}" = "dial" ] ; then
+    for i in reboot login dialup; do
+	cp lang/${i}.${LANGUAGE} /mnt/stand/${i}
+    done
+    ln -f /mnt/stand/reboot /mnt/stand/shutdown
+    (cd ../help;\
+    rm -rf tmp_hlp;\
+    mkdir tmp_hlp;\
+    for i in `ls *.hlp.${LANGUAGE}`; do \
+	    cp $i tmp_hlp/`basename $i .hlp.${LANGUAGE}`;\
+    done;\
+    cd tmp_hlp;\
+    ar -cru help.a *;\
+    cp help.a /mnt/help.a)
+fi
+
+echo "-> Making and installing crunch1..."
+cd crunch1
+make "SRC=${SRC}" && make install 2>&1 >/dev/null || fail $? crunch
+
+cd ${pwd}
+
+(echo "-> Fixing permissions"; cd /mnt; chown -R root *)
+
+# stage2
+
+#if [ ! -f ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel ]; then
+#    echo "-> ERROR: you must build PICOBSD${suffix}.${SIZE} first"
+#    exit 1
+#fi
+if [ ! -f ${SRC}/sys/compile/PICOBSD${suffix}/kernel ]; then
+    echo "-> ERROR: you must build PICOBSD${suffix} first"
+    exit 1
 fi
-if [ "${TYPE}" = "net" ]
-then
-	INODES=4096
+
+echo "-> Preparing kernel..."
+cp -p ${SRC}/sys/compile/PICOBSD${suffix}/kernel kernel
+if [ ! -f kernel ]; then
+	echo "-> ERROR: you must build PICOBSD${suffix} kernel first"
+	exit 1
 fi
-if [ "${TYPE}" = "isp" ]
-then
-	INODES=4096
+
+echo "-> Preparing kernel with MFS filesystem inside..."
+df -ik /mnt
+umount /mnt 2>&1 >/dev/null
+fsck -p /dev/rvn0c
+vnconfig -u /dev/rvn0 2>&1 >/dev/null
+
+#if [ ! -f ../tools/write_mfs_in_kernel/wmik ]; then
+#	(cd ../tools/write_mfs_in_kernel; make)
+#fi
+
+#../tools/write_mfs_in_kernel/wmik kernel fs.PICOBSD
+strip kernel
+strip --remove-section=.note --remove-section=.comment kernel
+gzip -9 -n kernel
+#rm fs.PICOBSD
+
+#---- stage3
+
+# stage3 -- prepare floppy filesystem and image.
+# by default we are in /usr/src/release/build
+#
+
+if [ ! -f kernel.gz ]; then
+	echo "-> ERROR: you must build kernel.gz first"
+	exit 1
 fi
-newfs -i $INODES -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
+
+echo "-> Preparing ${FLOPPY_SIZE}kB floppy filesystem..."
+umount /dev/vn0 2> /dev/null || true
+umount /mnt 2> /dev/null || true
+vnconfig -u /dev/rvn0 2> /dev/null || true
+
+dd of=picobsd.bin if=/dev/zero count=${FLOPPY_SIZE} bs=1k 2> /dev/null
+
+awk 'BEGIN {printf "%c%c", 85, 170}' | \
+                dd of=picobsd.bin obs=1 seek=510 conv=notrunc  2> /dev/null
+
+#vnconfig -s labels -c /dev/rvn0 picobsd.bin 2>/dev/null
+vnconfig -c /dev/rvn0 picobsd.bin 2>/dev/null || fail $? vnconfig2
+
+dd if=/boot/boot1 of=picobsd.bin conv=notrunc 2> /dev/null
+
+# XXX todo: right floppy size!
+disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 2>&1 >/dev/null || fail $?  disklabel
+
+newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
+
 mount /dev/vn0c /mnt
-if [ "X$?" != "X0" ]
-then
-	echo "-> Error while mounting fs.PICOBSD (/dev/vn0c) on /mnt..."
+
+echo "-> `pwd`: Populating floppy filesystem..."
+
+# copy floppy tree excluding private files.
+(cd ../floppy.tree ; \
+    tar -cvf - --exclude-from ../${TYPE}/floppy.tree.exclude . ) | \
+    (cd /mnt ; tar xvf - )
+
+# update with private files
+if [ -d ../${TYPE}/floppy.tree ] ; then
+    (cd ../${TYPE}/floppy.tree ; tar cvf - . ) | (cd /mnt ; tar xvf - )
+fi
+
+echo "-> `pwd`: Copying language dependent files..."
+for i in hosts motd ; do
+	cat ../${TYPE}/lang/${i}.${LANGUAGE} | \
+		sed -e "s/@VER@/${VER}/g" > /mnt/etc/${i}
+done
+
+if [ "${TYPE}" = "dial" ] ; then
+	cp -p /mnt/etc/master.passwd .
+	pwd_mkdb -d . master.passwd
+	mv spwd.db /mnt/etc/
+	rm pwd.db master.passwd
+fi
+
+if [ "X$?" != "X0" ] ; then
+	echo "-> ERROR while transferring ../${TYPE}/floppy.tree to /mnt..."
+	echo "-> Aborting $0"
+	exit 10
+fi
+
+cp kernel.gz /mnt/kernel.gz
+if [ "X$?" != "X0" ] ; then
+	echo "-> ERROR while transferring kernel.gz to /mnt..."
+	echo "-> Aborting $0"
+	exit 10
+fi
+
+gzip -9cv fs.PICOBSD > /mnt/fs.PICOBSD.gz
+if [ "X$?" != "X0" ] ; then
+	echo "\-> ERROR transferring MFS to /mnt"
 	echo "-> Aborting $0"
 	exit 10
 fi
+
+mkdir /mnt/boot
+mkdir /mnt/boot/defaults
+cp /boot/loader .
+# Make sure we have the a.out stubs we need...
+# This is deprecated for 3.X
+if [ ! -f /usr/lib/aout/kzhead.o ] ; then
+	(cd ${SRC}/sys/i386/boot/kzipboot && make all install clean)
+fi
+kzip -v loader
+mv loader.kz /mnt/boot/loader
+rm -f loader loader.o
+# XXX is next line ok ?
+echo "/boot/loader" >/mnt/boot.config
+cp ${SRC}/sys/boot/forth/loader.4th /mnt/boot/
+cp ${SRC}/sys/boot/forth/support.4th /mnt/boot/
+cp ${SRC}/sys/boot/forth/loader.conf /mnt/boot/defaults
+echo "userconfig_script_load=\"YES\"">/mnt/boot/loader.conf
+echo "rootfs_load=\"YES\"" >>/mnt/boot/loader.conf
+echo "rootfs_name=\"fs.PICOBSD\"" >>/mnt/boot/loader.conf
+echo "rootfs_type=\"mfs_root\"" >>/mnt/boot/loader.conf
+for i in frames screen
+do
+	cp ${SRC}/share/examples/bootforth/${i}.4th /mnt/boot/
+done
+cp ../forth/loader.rc /mnt/boot/loader.rc
+cp ../forth/menu.4th /mnt/boot/menu.4th
+(echo "-> Fixing permissions"; cd /mnt; chown -R root *)
+rm kernel.gz
+
+df -ik /mnt
+
+umount /mnt
+vnconfig -u /dev/rvn0
diff --git a/release/picobsd/build/stage2 b/release/picobsd/build/stage2
deleted file mode 100755
index 9354aadb1e83..000000000000
--- a/release/picobsd/build/stage2
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh -
-
-#
-#	$Id: stage2,v 1.2 1998/09/07 06:46:25 abial Exp $
-#
-set -e
-
-if [ ! -f kernel ]; then
-	echo "-> ERROR: you must build PICOBSD${suffix}.${SIZE} kernel first"
-	exit 1
-fi
-
-echo "-> Preparing kernel with MFS filesystem inside..."
-df -ik /mnt
-umount /mnt 2>&1 >/dev/null
-fsck -p /dev/rvn0c
-vnconfig -u /dev/rvn0 2>&1 >/dev/null
-
-if [ ! -f ../tools/write_mfs_in_kernel/wmik ]; then
-	(cd ../tools/write_mfs_in_kernel; make)
-fi
-
-../tools/write_mfs_in_kernel/wmik kernel fs.PICOBSD
-strip kernel
-strip --remove-section=.note --remove-section=.comment kernel
-gzip -9 -n kernel
-rm fs.PICOBSD
diff --git a/release/picobsd/build/stage3 b/release/picobsd/build/stage3
deleted file mode 100755
index bf4fee2ef6e5..000000000000
--- a/release/picobsd/build/stage3
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh -
-
-#
-#	$Id: stage3,v 1.4.2.3 1999/05/07 10:02:31 abial Exp $
-#
-set -e
-
-. ../Version
-
-if [ ! -f kernel.gz ]; then
-	echo "-> ERROR: you must build kernel.gz first"
-	exit 1
-fi
-
-echo "-> Preparing 1.44 floppy filesystem..."
-umount /dev/vn0 2> /dev/null || true
-umount /mnt 2> /dev/null || true
-vnconfig -u /dev/rvn0 2> /dev/null || true
-
-dd of=picobsd.bin if=/dev/zero count=1440 bs=1k 2> /dev/null
-
-awk 'BEGIN {printf "%c%c", 85, 170}' | \
-                dd of=picobsd.bin obs=1 seek=510 conv=notrunc  2> /dev/null
-
-#vnconfig -s labels -c /dev/rvn0 picobsd.bin 2>/dev/null
-vnconfig -c /dev/rvn0 picobsd.bin 2>/dev/null
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while doing vnconfig of picobsd.bin on /dev/rvn0..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-
-dd if=/boot/boot1 of=picobsd.bin conv=notrunc 2> /dev/null
-
-disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 2>&1 >/dev/null
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while labeling picobsd.bin on /dev/rvn0..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-
-newfs -i 32768 -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
-
-mount /dev/vn0c /mnt
-
-pwd=`pwd`
-
-cd ../${TYPE}/floppy.tree
-echo "-> Copying language dependent files..."
-for i in hosts motd rc resolv.conf
-do
-	cat ../lang/${i}.${LANGUAGE} | \
-		sed -e "s/@VER@/${VER}/g" > \
-		etc/${i}
-done
-if [ "${TYPE}" != "router" ]
-then
-	cat ../lang/rc.conf.${LANGUAGE} | \
-		sed -e "s/@VER@/${VER}/g" > \
-		etc/rc.conf
-	cat ../lang/rc.network.${LANGUAGE}| \
-		sed -e "s/@VER@/${VER}/g" > \
-		etc/rc.network
-fi
-
-echo "-> Populating floppy filesystem..."
-cp -pr . /mnt
-rm -rf /mnt/CVS /mnt/etc/CVS /mnt/etc/ppp/CVS
-if [ "${TYPE}" = "dial" ]
-then
-	pwd_mkdb -d etc/ etc/master.passwd
-	mv etc/spwd.db /mnt/etc/
-	rm etc/pwd.db
-fi
-
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while transferring ../${TYPE}/floppy.tree to /mnt..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-
-cd ${pwd}
-cp kernel.gz /mnt/kernel.gz
-if [ "X$?" != "X0" ]
-then
-	echo "-> ERROR while transferring kernel.gz to /mnt..."
-	echo "-> Aborting $0"
-	exit 10
-fi
-mkdir /mnt/boot
-mkdir /mnt/boot/defaults
-cp /boot/loader .
-# Make sure we have the a.out stubs we need...
-if [ ! -f /usr/lib/aout/kzhead.o ]
-then
-	(cd ${SRC}/sys/i386/boot/kzipboot && make all install clean)
-fi
-kzip -v loader
-mv loader.kz /mnt/boot/loader
-rm -f loader loader.o
-#echo "/boot/loader" >/mnt/boot.config
-cp ${SRC}/sys/boot/forth/loader.4th /mnt/boot/
-cp ${SRC}/sys/boot/forth/support.4th /mnt/boot/
-cp ${SRC}/sys/boot/forth/loader.conf /mnt/boot/defaults
-echo "userconfig_script_load=\"YES\"">/mnt/boot/loader.conf
-for i in frames screen
-do
-	cp ${SRC}/share/examples/bootforth/${i}.4th /mnt/boot/
-done
-cp ../forth/loader.rc /mnt/boot/loader.rc
-cp ../forth/menu.4th /mnt/boot/menu.4th
-(echo "-> Fixing permissions"; cd /mnt; chown -R root *)
-rm kernel.gz
-
-df -ik /mnt
-
-umount /mnt
-vnconfig -u /dev/rvn0
diff --git a/release/picobsd/dial/mfs.tree/Makefile b/release/picobsd/dial/Makefile.mfs
index 98a79b3bf9eb..790c95b1698d 100644
--- a/release/picobsd/dial/mfs.tree/Makefile
+++ b/release/picobsd/dial/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.5.2.1 1999/05/09 22:03:54 abial Exp $
+# $Id: Makefile,v 1.7 1999/06/14 15:41:33 roger Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/dial/conf/PICOBSD b/release/picobsd/dial/PICOBSD
index 61d851fbde91..0c8c1eec5e6d 100644
--- a/release/picobsd/dial/conf/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.5.2.1 1999/02/07 22:19:52 abial Exp $
+# $Id: PICOBSD,v 1.7 1999/05/24 17:26:32 roger Exp $
 #
 machine		i386
 cpu		I386_CPU
diff --git a/release/picobsd/dial/conf/Makefile b/release/picobsd/dial/conf/Makefile
deleted file mode 100644
index 4be01f8f414e..000000000000
--- a/release/picobsd/dial/conf/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile,v 1.3 1998/10/15 21:39:58 abial Exp $
-#
-
-SRC?=/usr/src
-CONF?=$(SRC)/sys/i386/conf
-
-CONFFILE=PICOBSD${suffix}.${SIZE}
-COMPILE=$(SRC)/sys/compile/$(CONFFILE)
-KERNFILE=$(COMPILE)/kernel
-
-all: $(KERNFILE)
-
-$(KERNFILE): PICOBSD
-	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
-	(cd ${CONF}; \
-	config ${CONFFILE}; \
-	cd ${COMPILE}; \
-	make depend all)
-
diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile
index afc89eb1575a..000be6876bf5 100644
--- a/release/picobsd/dial/crunch1/Makefile
+++ b/release/picobsd/dial/crunch1/Makefile
@@ -7,11 +7,10 @@ SRC?=/usr/src
 all: crunch
 
 crunch:
-	if [ "X${INIT}" != "X" ]; \
-	then \
-		echo "progs ${INIT}" >crunch1.conf ; \
-	else \
+	if [ "${INIT}" = "init" ]; then \
 		echo "progs init getty" >crunch1.conf ; \
+	else \
+		echo "progs ${INIT}" >crunch1.conf ; \
 	fi;
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >>crunch1.conf
 	@crunchgen ${.CURDIR}/crunch1.conf
diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf
index 06632c299658..b6284fc401e0 100644
--- a/release/picobsd/dial/crunch1/crunch.conf
+++ b/release/picobsd/dial/crunch1/crunch.conf
@@ -1,4 +1,4 @@
-# $Id: crunch.conf,v 1.5.2.2 1999/05/21 15:39:08 roger Exp $
+# $Id: crunch.conf,v 1.5.2.1 1999/05/07 10:02:35 abial Exp $
 #
 # NOTE1: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -28,7 +28,8 @@ srcdirs /usr/src/libexec
 # ns, vm etc...
 srcdirs ../../tinyware
 
-progs ppp ssh ftp telnet ee gzip more
+# XXX removed ssh -- lr990817
+progs ppp ftp telnet ee gzip more
 ln gzip gunzip
 ln gzip zcat
 ln gzip gzcat
@@ -53,4 +54,5 @@ ln chown chgrp
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lgnuregex -lmp -lgmp -lm
 libs -lncurses -lmytinfo -lipx -lz
-libs -ltermcap -ltelnet -lalias -lradius
+libs -ltermcap -ltelnet -lalias
+libs -lradius	# for ppp
diff --git a/release/picobsd/dial/floppy.tree.exclude b/release/picobsd/dial/floppy.tree.exclude
new file mode 100644
index 000000000000..f64a9912e1ce
--- /dev/null
+++ b/release/picobsd/dial/floppy.tree.exclude
@@ -0,0 +1,15 @@
+etc/disktab
+etc/inetd.conf
+etc/master.passwd
+etc/mfs.rc
+etc/ppp.conf
+etc/ppp.conf
+etc/ppp.linkup
+etc/rc
+etc/rc.conf
+etc/rc.firewall
+etc/rc.serial
+etc/remote
+etc/shells
+etc/snmpd.conf
+etc/ttys
diff --git a/release/picobsd/dial/floppy.tree/etc/gettytab b/release/picobsd/dial/floppy.tree/etc/gettytab
deleted file mode 100644
index 612c875f5a55..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/gettytab
+++ /dev/null
@@ -1,40 +0,0 @@
-#	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
-#
-default:\
-	:cb:ce:ck:lc:fd#1000:cl:im=\r\n     PicoBSD (%h) (%t)     \r\n\r\n:sp#1200:
-
-P|Pc|Pc console:\
-	:ht:np:sp#115200:
-
-#
-# Fixed speed entries
-2|std.9600|9600-baud:\
-	:np:sp#9600:
-g|std.19200|19200-baud:\
-	:np:sp#19200:
-std.38400|38400-baud:\
-	:np:sp#38400:
-std.57600|57600-baud:\
-	:np:sp#57600:
-std.115200|115200-baud:\
-	:np:sp#115200:
-
-#
-# Entry specifying explicit device settings.  See termios(4) and
-# /usr/include/termios.h, too.  The entry forces the tty into
-# CLOCAL mode (so no DCD is required), and uses Xon/Xoff flow control.
-#
-# cflags: CLOCAL | HUPCL | CREAD | CS8
-# oflags: OPOST | ONLCR | OXTABS
-# iflags: IXOFF | IXON | ICRNL | IGNPAR
-# lflags: IEXTEN | ICANON | ISIG | ECHOCTL | ECHO | ECHOK | ECHOE | ECHOKE
-#
-# The `0' flags don't have input enabled.  The `1' flags don't echo.
-# (Echoing is done inside getty itself.)
-#
-local.9600|CLOCAL tty @ 9600 Bd:\
-	:c0#0x0000c300:c1#0x0000cb00:c2#0x0000cb00:\
-	:o0#0x00000007:o1#0x00000002:o2#0x00000007:\
-	:i0#0x00000704:i1#0x00000000:i2#0x00000704:\
-	:l0#0x000005cf:l1#0x00000000:l2#0x000005cf:\
-	:sp#9600:
diff --git a/release/picobsd/dial/floppy.tree/etc/host.conf b/release/picobsd/dial/floppy.tree/etc/host.conf
deleted file mode 100644
index 8418e146a702..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/host.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: host.conf,v 1.1.1.1 1998/07/14 07:30:41 abial Exp $
-hosts
-bind
diff --git a/release/picobsd/dial/floppy.tree/etc/login.conf b/release/picobsd/dial/floppy.tree/etc/login.conf
deleted file mode 100644
index 451dc8ad51f6..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/login.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-# This file controls resource limits, accounting limits and
-# default user environment settings.
-#
-#	$Id: login.conf,v 1.2 1999/01/12 14:09:19 asami Exp $
-#
-
-
-# Authentication methods
-
-auth-defaults:\
-	:auth=passwd:
-
-auth-root-defaults:\
-	:auth-login=passwd:\
-	:auth-rlogin=passwd:\
-
-auth-ftp-defaults:\
-	:auth=passwd:
-
-# Example defaults
-# These settings are used by login(1) by default for classless users
-# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
-
-default:\
-	:cputime=infinity:\
-	:datasize-cur=22M:\
-	:stacksize-cur=8M:\
-	:memorylocked-cur=10M:\
-	:memoryuse-cur=30M:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:maxproc-cur=64:\
-	:openfiles-cur=64:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-defaults:
-
-
-#
-# standard - standard user defaults
-#
-standard:\
-	:copyright=/etc/COPYRIGHT:\
-	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
-	:path=~/bin /bin /usr/bin:\
-	:nologin=/var/run/nologin:\
-	:cputime=1h30m:\
-	:datasize=8M:\
-	:stacksize=2M:\
-	:memorylocked=4M:\
-	:memoryuse=8M:\
-	:filesize=8M:\
-	:coredumpsize=8M:\
-	:openfiles=24:\
-	:maxproc=32:\
-	:priority=0:\
-	:requirehome:\
-	:passwordtime=90d:\
-	:umask=002:\
-	:ignoretime@:\
-	:tc=default:
-#
-# Staff users - few restrictions and allow login anytime
-#
-staff:\
-	:ignorenologin:\
-	:ignoretime:\
-	:requirehome@:\
-	:accounted@:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:umask=022:\
-	:tc=standard:
-
-
-#
-# root - fallback for root logins
-#
-root:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:cputime=infinity:\
-	:datasize=infinity:\
-	:stacksize=infinity:\
-	:memorylocked=infinity:\
-	:memoryuse=infinity:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:openfiles=infinity:\
-	:maxproc=infinity:\
-	:memoryuse-cur=32M:\
-	:maxproc-cur=64:\
-	:openfiles-cur=1024:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-root-defaults:\
-#
-# Settings used by /etc/rc
-#
-daemon:\
-	:coredumpsize@:\
-	:coredumpsize-cur=0:\
-	:datasize=infinity:\
-	:datasize-cur@:\
-	:maxproc=512:\
-	:maxproc-cur@:\
-	:memoryuse-cur=64M:\
-	:memorylocked-cur=64M:\
-	:openfiles=1024:\
-	:openfiles-cur@:\
-	:stacksize=16M:\
-	:stacksize-cur@:\
-	:tc=default:
-#
-# Polish Users Accounts. Setup proper environment variables.
-#
-polish:Polish Users Accounts:\
-	:lang=pl_pl.ISO-8859-2:\
-	:tc=default:
diff --git a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/dial/floppy.tree/etc/ppp/ppp.secret.sample
deleted file mode 100644
index 7e8ee6765924..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.secret.sample
+++ /dev/null
@@ -1,23 +0,0 @@
-##################################################
-#
-#          Example of ppp.secret file
-#
-#  This file is used to authenticate incoming connections.
-#  You must ``enable'' either PAP or CHAP in your ppp.conf file.
-#  The peer may then use any of the Authname/Authkey pairs listed.
-#  If an IP address is given, it will be assigned to the peer.
-#  
-#  If an entry exists for your local machine (as given by the
-#  ``hostname -s'' command), the password specified will be
-#  required for all server socket connections.  Refer to the ppp(8)
-#  and pppctl(8) man pages for further details.
-#
-# $Id: ppp.secret.sample,v 1.1.1.1 1998/07/14 07:30:41 abial Exp $
-#
-##################################################
-
-# Authname	Authkey			Peer's IP address
-
-oscar		OurSecretKey		192.244.184.34/24
-BigBird		X4dWg9327		192.244.184.33/32
-tama		localPasswdForControl 
diff --git a/release/picobsd/dial/floppy.tree/etc/profile b/release/picobsd/dial/floppy.tree/etc/profile
deleted file mode 100644
index b0aa3b20c38c..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/profile
+++ /dev/null
@@ -1,4 +0,0 @@
-# System-wide .profile file for sh(1).
-BLOCKSIZE=K; export BLOCKSIZE
-PATH=/stand:.; export PATH
-set -o emacs
diff --git a/release/picobsd/dial/floppy.tree/etc/ssh_config b/release/picobsd/dial/floppy.tree/etc/ssh_config
deleted file mode 100644
index 6e1694cc2478..000000000000
--- a/release/picobsd/dial/floppy.tree/etc/ssh_config
+++ /dev/null
@@ -1,2 +0,0 @@
-Host *
-FallBackToRsh no
diff --git a/release/picobsd/dial/lang/mfs.rc.pl b/release/picobsd/dial/lang/mfs.rc.pl
deleted file mode 100755
index d59befd5a0c8..000000000000
--- a/release/picobsd/dial/lang/mfs.rc.pl
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# $Id: mfs.rc.pl,v 1.3 1998/08/07 19:29:57 abial Exp $
-
-### WARNING !!!! ###
-# We remove this file during execution (see EOF)
-# Awful things happen if its size is > 1024B
-trap : 2
-trap : 3	# shouldn't be needed
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-trap "echo 'Reboot zostal przerwany'; exit 1" 3
-sysctl -w vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1 2>&1 >/dev/null
-echo ""
-echo "-----------------------------------------------"
-echo "  Prosze czekac. Trwa uruchamianie systemu..."
-echo "-----------------------------------------------"
-echo ""
-echo "Wczytuje konfiguracje z /etc z dyskietki... "
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
-cd /etc
-umount /start_floppy
-echo "Ok. (Jesli chcesz, mozesz juz wyjac dyskietke)"
-echo ""
-. rc
-exit 0
diff --git a/release/picobsd/dial/lang/rc.conf.en b/release/picobsd/dial/lang/rc.conf.en
deleted file mode 100644
index aca4e46605b3..000000000000
--- a/release/picobsd/dial/lang/rc.conf.en
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.en,v 1.2 1998/08/10 19:07:53 abial Exp $
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.edu"	# Set this!
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-###  System console options  #################################
-keymap="NO"		# keymap in /usr/share/syscons/* (or NO).
-keyrate="NO"		# keyboard rate to: slow, normal, fast (or NO).
-keybell="NO"		# bell to duration.pitch or normal or visual (or NO).
-keychange="NO"		# function keys default values (or NO).
-cursor="NO"		# cursor type {normal|blink|destructive} (or NO).
-font8x16="NO"		# font 8x16 from /usr/share/syscons/* (or NO).
-font8x14="NO"		# font 8x14 from /usr/share/syscons/* (or NO).
-font8x8="NO"		# font 8x8 from /usr/share/syscons/* (or NO).
-blanktime="NO"		# blank time (in seconds) or "NO" to turn it off.
-moused_enable="YES"	# Run the mouse daemon
-moused_type="microsoft"
-moused_port="/dev/cuaa0"
-moused_flags="-3"
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/dial/lang/rc.conf.pl b/release/picobsd/dial/lang/rc.conf.pl
deleted file mode 100644
index 28a0bda34f27..000000000000
--- a/release/picobsd/dial/lang/rc.conf.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.pl,v 1.3 1998/08/10 19:07:53 abial Exp $
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.org.pl"	# Set this!
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-###  System console options  #################################
-keymap="pl_PL.ISO_8859-2.kbd"		# keymap in /usr/share/syscons/* (or NO).
-keyrate="NO"		# keyboard rate to: slow, normal, fast (or NO).
-keybell="NO"		# bell to duration.pitch or normal or visual (or NO).
-keychange="NO"		# function keys default values (or NO).
-cursor="NO"		# cursor type {normal|blink|destructive} (or NO).
-font8x16="iso02-8x16.fnt"		# font 8x16 from /usr/share/syscons/* (or NO).
-font8x14="NO"		# font 8x14 from /usr/share/syscons/* (or NO).
-font8x8="NO"		# font 8x8 from /usr/share/syscons/* (or NO).
-blanktime="NO"		# blank time (in seconds) or "NO" to turn it off.
-moused_enable="YES"	# Run the mouse daemon
-moused_type="microsoft"
-moused_port="/dev/cuaa0"
-moused_flags="-3"
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/dial/lang/rc.en b/release/picobsd/dial/lang/rc.en
deleted file mode 100644
index 8a0e806c1e02..000000000000
--- a/release/picobsd/dial/lang/rc.en
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-# $Id: rc.en,v 1.2 1998/09/26 17:27:19 abial Exp $
-############################################
-### Special setup for one floppy PICOBSD ###
-### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
-############################################
-mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
-	. /etc/rc.network
-	network_pass1
-fi
-# clean up left-over files
-if [ -n "$network_pass1_done" ]; then
-    network_pass2
-fi
-if [ -n "$network_pass2_done" ]; then
-    network_pass3
-fi
-
-# stdin must be redirected because it might be for a serial console
-kbddev=/dev/ttyv0
-viddev=/dev/ttyv0
-
-echo -n "Configuring console:"
-
-# keymap
-if [ "X${keymap}" != X"NO" ]; then
-	echo -n '  keymap';	kbdcontrol < ${kbddev} -l /usr/share/syscons/${keymap}
-fi
-
-# keyrate
-if [ "X${keyrate}" != X"NO" ]; then
-	echo -n ' keyrate';	kbdcontrol < ${kbddev} -r ${keyrate}
-fi
-
-# keybell
-if [ "X${keybell}" != X"NO" ]; then
-	echo -n ' keybell';	kbdcontrol < ${kbddev} -b ${keybell}
-fi
-
-# change function keys
-if [ "X${keychange}" != X"NO" ]; then
-	echo -n " keychange"
-	set - ${keychange}
-	while [ $# -gt 0 ]
-	do
-		kbdcontrol < ${kbddev} -f "$1" "$2"
-		shift; shift
-	done
-fi
-
-# cursor type
-if [ "X${cursor}" != X"NO" ]; then
-	echo -n '  cursor';	vidcontrol < ${viddev} -c ${cursor}
-fi
-
-# font 8x16
-if [ "X${font8x16}" != X"NO" ]; then
-	echo -n ' font8x16';	vidcontrol < ${viddev} -f 8x16 /usr/share/syscons/${font8x16}
-fi
-
-# font 8x14
-if [ "X${font8x14}" != X"NO" ]; then
-	echo -n ' font8x14';	vidcontrol < ${viddev} -f 8x14 /usr/share/syscons/${font8x14}
-fi
-
-# font 8x8
-if [ "X${font8x8}" != X"NO" ]; then
-	echo -n ' font8x8';	vidcontrol < ${viddev} -f 8x8 /usr/share/syscons/${font8x8}
-fi
-
-# blank time
-if [ "X${blanktime}" != X"NO" ]; then
-	echo -n ' blanktime';	vidcontrol < ${viddev} -t ${blanktime}
-fi
-
-# mouse daemon
-if [ "X${moused_enable}" = X"YES" ] ; then
-	echo -n ' moused'
-	moused ${moused_flags} -p ${moused_port} -t ${moused_type}
-	vidcontrol <${viddev} -m on
-fi
-
-echo ''
-echo ''
-echo ''
-echo '+---------- PicoBSD @VER@ (DIALUP) -------------+'
-echo '|                                              |'
-echo '| Log in as "root" (no password).              |'
-echo '|                                              |'
-echo '| This version of PicoBSD is fully under       |'
-echo '| BSD license (except for SSH). For more       |'
-echo '| details see http://www.freebsd.org/~picobsd, |'
-echo '| or contact the author.                       |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
-exit 0
diff --git a/release/picobsd/dial/lang/rc.network.en b/release/picobsd/dial/lang/rc.network.en
deleted file mode 100644
index ff32f4493339..000000000000
--- a/release/picobsd/dial/lang/rc.network.en
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.en,v 1.1.1.1 1998/07/14 07:30:42 abial Exp $
-network_pass1() {
-    echo -n 'Doing initial network setup:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Additional routing options:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' turning on ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/dial/lang/rc.network.pl b/release/picobsd/dial/lang/rc.network.pl
deleted file mode 100644
index 196f32bc6df2..000000000000
--- a/release/picobsd/dial/lang/rc.network.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.pl,v 1.1.1.1 1998/07/14 07:30:42 abial Exp $
-network_pass1() {
-    echo -n 'Wstepna konfiguracja sieci:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Dodatkowe opcje routingu:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' wlaczam ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/dial/lang/rc.pl b/release/picobsd/dial/lang/rc.pl
deleted file mode 100644
index 61dfd2f76b33..000000000000
--- a/release/picobsd/dial/lang/rc.pl
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# $Id: rc.pl,v 1.2 1998/09/26 17:27:19 abial Exp $
-#
-############################################
-### Special setup for one floppy PICOBSD ###
-### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
-############################################
-mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-# configure serial devices
-if [ -f /etc/rc.serial ]; then
-	. /etc/rc.serial
-fi
-# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
-	. /etc/rc.network
-	network_pass1
-fi
-if [ -n "$network_pass1_done" ]; then
-    network_pass2
-fi
-if [ -n "$network_pass2_done" ]; then
-    network_pass3
-fi
-
-# stdin must be redirected because it might be for a serial console
-kbddev=/dev/ttyv0
-viddev=/dev/ttyv0
-
-echo -n "Konfigurowanie konsoli:"
-
-# keymap
-if [ "X${keymap}" != X"NO" ]; then
-	echo -n '  mapa klawiatury';	kbdcontrol <${kbddev} -l /usr/share/syscons/${keymap}
-fi
-
-# keyrate
-if [ "X${keyrate}" != X"NO" ]; then
-	echo -n ' keyrate';	kbdcontrol <${kbddev} -r ${keyrate}
-fi
-
-# keybell
-if [ "X${keybell}" != X"NO" ]; then
-	echo -n ' keybell';	kbdcontrol <${kbddev} -b ${keybell}
-fi
-
-# change function keys
-if [ "X${keychange}" != X"NO" ]; then
-	echo -n " keychange"
-	set - ${keychange}
-	while [ $# -gt 0 ]
-	do
-		kbdcontrol <${kbddev} -f "$1" "$2"
-		shift; shift
-	done
-fi
-
-# cursor type
-if [ "X${cursor}" != X"NO" ]; then
-	echo -n '  kursor';	vidcontrol <${viddev} -c ${cursor}
-fi
-
-# font 8x16
-if [ "X${font8x16}" != X"NO" ]; then
-	echo -n ' font8x16';	vidcontrol <${viddev} -f 8x16 /usr/share/syscons/${font8x16}
-fi
-
-# font 8x14
-if [ "X${font8x14}" != X"NO" ]; then
-	echo -n ' font8x14';	vidcontrol <${viddev} -f 8x14 /usr/share/syscons/${font8x14}
-fi
-
-# font 8x8
-if [ "X${font8x8}" != X"NO" ]; then
-	echo -n ' font8x8';	vidcontrol <${viddev} -f 8x8 /usr/share/syscons/${font8x8}
-fi
-
-# blank time
-if [ "X${blanktime}" != X"NO" ]; then
-	echo -n ' wygaszacz';	vidcontrol <${viddev} -t ${blanktime}
-fi
-
-# mouse daemon
-if [ "X${moused_enable}" = X"YES" ] ; then
-	echo -n ' moused'
-	moused ${moused_flags} -p ${moused_port} -t ${moused_type}
-	vidcontrol <${viddev} -m on
-fi
-
-echo ''
-echo ''
-echo '+----------- PicoBSD @VER@ (DIALUP) ------------+'
-echo '|                                              |'
-echo '| Zaloguj sie jako "root" (brak hasla).        |'
-echo '|                                              |'
-echo '| PicoBSD podlega licencji BSD (z wyjatkiem    |'
-echo '| SSH). Po wiecej szczegolow zajrzyj na        |'
-echo '| http://www.freebsd.org/~picobsd, lub         |'
-echo '| skontaktuj sie z autorem.                    |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
-exit 0
diff --git a/release/picobsd/dial/lang/resolv.conf.en b/release/picobsd/dial/lang/resolv.conf.en
deleted file mode 100644
index c373f5b10805..000000000000
--- a/release/picobsd/dial/lang/resolv.conf.en
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.en,v 1.1.1.1 1998/07/14 07:30:42 abial Exp $
-domain		mydomain.edu
-nameserver	192.33.4.12
diff --git a/release/picobsd/dial/lang/resolv.conf.pl b/release/picobsd/dial/lang/resolv.conf.pl
deleted file mode 100644
index 1843c29d4a26..000000000000
--- a/release/picobsd/dial/lang/resolv.conf.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.pl,v 1.2 1998/08/10 19:07:53 abial Exp $
-domain		mydomain.org.pl
-nameserver	194.204.159.1
diff --git a/release/picobsd/dial/mfs.tree/mfs.mtree b/release/picobsd/dial/mfs.mtree
index 9e0318a62b38..11aafac88e91 100644
--- a/release/picobsd/dial/mfs.tree/mfs.mtree
+++ b/release/picobsd/dial/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $Id: mfs.mtree,v 1.2 1998/08/31 12:32:30 abial Exp $
+# $Id: mfs.mtree,v 1.3 1998/09/07 19:00:25 abial Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/dial/mfs.tree/login.conf b/release/picobsd/dial/mfs.tree/login.conf
deleted file mode 100644
index ddfb8cc6c3cd..000000000000
--- a/release/picobsd/dial/mfs.tree/login.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-#	$Id: login.conf,v 1.1 1998/08/10 19:08:02 abial Exp $
-
-# Authentication methods
-
-auth-defaults:\
-	:auth=krb_skey_or_passwd,passwd,kerberos,skey:
-
-auth-root-defaults:\
-	:auth-login=krb_skey_or_passwd,passwd,kerberos,skey:\
-	:auth-rlogin=krb_or_skey,kerberos,skey:
-auth-ftp-defaults:\
-	:auth=skey_or_pwd,passwd,skey:
-# Example defaults
-default:\
-	:cputime=infinity:\
-	:datasize-cur=22M:\
-	:stacksize-cur=8M:\
-	:memorylocked-cur=10M:\
-	:memoryuse-cur=30M:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:maxproc-cur=64:\
-	:openfiles-cur=64:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-defaults:
-
-# root - fallback for root logins
-root:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:cputime=infinity:\
-	:datasize=infinity:\
-	:stacksize=infinity:\
-	:memorylocked=infinity:\
-	:memoryuse=infinity:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:openfiles=infinity:\
-	:maxproc=infinity:\
-	:memoryuse-cur=32M:\
-	:maxproc-cur=64:\
-	:openfiles-cur=1024:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-root-defaults:
-# Settings used by /etc/rc
-daemon:\
-	:coredumpsize@:\
-	:coredumpsize-cur=0:\
-	:datasize=infinity:\
-	:datasize-cur@:\
-	:maxproc=512:\
-	:maxproc-cur@:\
-	:memoryuse-cur=64M:\
-	:memorylocked-cur=64M:\
-	:openfiles=1024:\
-	:openfiles-cur@:\
-	:stacksize=16M:\
-	:stacksize-cur@:\
-	:tc=default:
diff --git a/release/picobsd/dial/floppy.tree/boot.config b/release/picobsd/floppy.tree/boot.config
index e69de29bb2d1..e69de29bb2d1 100644
--- a/release/picobsd/dial/floppy.tree/boot.config
+++ b/release/picobsd/floppy.tree/boot.config
diff --git a/release/picobsd/isp/floppy.tree/etc/disktab b/release/picobsd/floppy.tree/etc/disktab
index 7575ba66e088..7575ba66e088 100644
--- a/release/picobsd/isp/floppy.tree/etc/disktab
+++ b/release/picobsd/floppy.tree/etc/disktab
diff --git a/release/picobsd/dial/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index 64d34ca9b1ae..64d34ca9b1ae 100644
--- a/release/picobsd/dial/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
diff --git a/release/picobsd/isp/floppy.tree/etc/gettytab b/release/picobsd/floppy.tree/etc/gettytab
index 90562acf2505..90562acf2505 100644
--- a/release/picobsd/isp/floppy.tree/etc/gettytab
+++ b/release/picobsd/floppy.tree/etc/gettytab
diff --git a/release/picobsd/dial/floppy.tree/etc/group b/release/picobsd/floppy.tree/etc/group
index abbd733f3b0b..abbd733f3b0b 100644
--- a/release/picobsd/dial/floppy.tree/etc/group
+++ b/release/picobsd/floppy.tree/etc/group
diff --git a/release/picobsd/floppy.tree/etc/host.conf b/release/picobsd/floppy.tree/etc/host.conf
new file mode 100644
index 000000000000..c67b871b42b5
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/host.conf
@@ -0,0 +1,3 @@
+# $Id: host.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+hosts
+bind
diff --git a/release/picobsd/isp/floppy.tree/etc/inetd.conf b/release/picobsd/floppy.tree/etc/inetd.conf
index c7c50de341e4..c7c50de341e4 100644
--- a/release/picobsd/isp/floppy.tree/etc/inetd.conf
+++ b/release/picobsd/floppy.tree/etc/inetd.conf
diff --git a/release/picobsd/router/floppy.tree/etc/login.conf b/release/picobsd/floppy.tree/etc/login.conf
index 9dcf20718497..17bfb137ab45 100644
--- a/release/picobsd/router/floppy.tree/etc/login.conf
+++ b/release/picobsd/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.2 1999/01/12 14:09:22 asami Exp $
+#	$Id: login.conf,v 1.2.2.1 1999/04/30 18:48:09 hoek Exp $
 #
 
 
diff --git a/release/picobsd/isp/floppy.tree/etc/master.passwd b/release/picobsd/floppy.tree/etc/master.passwd
index 9d85cdf91b0e..9d85cdf91b0e 100644
--- a/release/picobsd/isp/floppy.tree/etc/master.passwd
+++ b/release/picobsd/floppy.tree/etc/master.passwd
diff --git a/release/picobsd/router/mfs.tree/login.conf b/release/picobsd/floppy.tree/etc/mfs.login.conf
index 664d03c0a4c7..63322928ef04 100644
--- a/release/picobsd/router/mfs.tree/login.conf
+++ b/release/picobsd/floppy.tree/etc/mfs.login.conf
@@ -1,4 +1,4 @@
-#	$Id: login.conf,v 1.1 1998/08/02 13:03:33 abial Exp $
+#	$Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 # Authentication methods
 
diff --git a/release/picobsd/dial/lang/mfs.rc.en b/release/picobsd/floppy.tree/etc/mfs.rc
index de53bbbc64b7..22b7678e49cf 100755..100644
--- a/release/picobsd/dial/lang/mfs.rc.en
+++ b/release/picobsd/floppy.tree/etc/mfs.rc
@@ -1,9 +1,11 @@
 #!/bin/sh
-# $Id: mfs.rc.en,v 1.3 1998/08/07 19:29:57 abial Exp $
+# $Id: mfs.rc.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 ### WARNING !!!!!! #####
 # We remove this file during execution (see EOF).
 # Awful things happen if its size is > 1024B
 
+stty status '^T'
+
 trap : 2
 trap : 3
 
@@ -13,8 +15,7 @@ export PATH
 
 trap "echo 'Reboot interrupted'; exit 1" 3
 
-sysctl -w vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1 2>&1 >/dev/null
-
+### Special setup for one floppy PICOBSD ###
 echo ""
 echo "-------------------------------------------"
 echo "  Please wait. The system is coming up..."
@@ -25,6 +26,7 @@ mount -o rdonly /dev/fd0a /start_floppy
 cd /start_floppy/etc
 cp -Rp . /etc/
 cd /etc
+pwd_mkdb -p ./master.passwd
 umount /start_floppy
 echo "Ok. (Now you can remove floppy if you like)"
 echo ""
diff --git a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
index ed5da5dd72ce..ed5da5dd72ce 100644
--- a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.conf
diff --git a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.deny b/release/picobsd/floppy.tree/etc/ppp/ppp.deny
index 51e1e9bd03e3..51e1e9bd03e3 100644
--- a/release/picobsd/dial/floppy.tree/etc/ppp/ppp.deny
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.deny
diff --git a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.linkup b/release/picobsd/floppy.tree/etc/ppp/ppp.linkup
index 05107c6df855..05107c6df855 100644
--- a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.linkup
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.linkup
diff --git a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
index 25d97d045002..f61015b20ee0 100644
--- a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $Id: ppp.secret.sample,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
+# $Id: ppp.secret.sample,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/isp/floppy.tree/etc/profile b/release/picobsd/floppy.tree/etc/profile
index babb9333f494..babb9333f494 100644
--- a/release/picobsd/isp/floppy.tree/etc/profile
+++ b/release/picobsd/floppy.tree/etc/profile
diff --git a/release/picobsd/dial/floppy.tree/etc/protocols b/release/picobsd/floppy.tree/etc/protocols
index c80be39f693a..c80be39f693a 100644
--- a/release/picobsd/dial/floppy.tree/etc/protocols
+++ b/release/picobsd/floppy.tree/etc/protocols
diff --git a/release/picobsd/isp/lang/rc.en b/release/picobsd/floppy.tree/etc/rc
index ad135e31ab19..3621c50a49cd 100644
--- a/release/picobsd/isp/lang/rc.en
+++ b/release/picobsd/floppy.tree/etc/rc
@@ -1,10 +1,27 @@
 #!/bin/sh
-# $Id: rc.en,v 1.4 1999/01/12 14:09:20 asami Exp $
+# $Id: rc.en,v 1.5 1999/01/19 23:11:50 abial Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
 ############################################
 mount -a -t nonfs
+# before calling rc.conf, try to identify the system by using the
+# ethernet address and name of the first interface. This is available
+# to rc.conf and others as $main_eth $main_if for further processing.
+
+main_ether=""
+for main_if in `ifconfig -l` ; do
+    set `ifconfig $main_if`
+    while [ "$1" != "" ] ; do
+	if [ $1 = "ether" ] ; then
+	    main_ether=$2
+	    break 2
+	else
+	    shift
+	fi
+    done
+done
+
 if [ -f /etc/rc.conf ]; then
     . /etc/rc.conf
 fi
diff --git a/release/picobsd/floppy.tree/etc/rc.conf b/release/picobsd/floppy.tree/etc/rc.conf
new file mode 100644
index 000000000000..4a0c5c42522b
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/rc.conf
@@ -0,0 +1,61 @@
+#!/bin/sh
+# $Id$
+#
+# rc.conf for picobsd.
+# $main_ether and $main_if are set from rc to the ethernet address and
+# name of the first ethernet interface, if available, so a simple
+# here-document below can be used for autoconfiguration.
+# Remaining parameters are set using a switch.
+
+while read ether hostname ip mask ; do
+    if [ "$ether" = "$main_ether" -o "$ether" = "default" ] ; then
+        break
+    fi
+done <<__eof__
+# Insert here the description of the system
+# default terminates the search.
+# main_ether      hostname    ip           mask
+00:20:18:2f:f4:2e rizzo       131.114.9.26 0xffffff00
+00:c0:58:21:9e:a0 aula29      10.1.1.11    0xffffff00
+52:54:00:e0:f3:73 tlcradar    10.1.1.25    0xffffff00
+52:54:00:e3:55:2e troika      10.1.1.2     0xffffff00
+default           default     10.0.0.1     0xffffff00
+__eof__
+
+eval ifconfig_${main_if}=\"inet \$ip netmask \$mask\"
+network_interfaces=`ifconfig -l`
+
+case $hostname in 
+troika)
+    sysctl -w net.link.ether.bridge_cfg="ed4:2,ed5:1,ed6:1"
+    sysctl -w net.inet.ip.forwarding=1
+    ifconfig ed4 131.114.9.2 netmask 0xffffff00
+    ifconfig ed4 10.1.1.2 netmask 0xffffff00 alias
+    ifconfig ed5 131.114.5.129 netmask 0xffffff80
+    route add default 131.114.9.29
+    route add 131.114.5.0/26 131.114.5.130
+    route add 131.114.5.64/26 131.114.5.65
+    ;;
+esac
+
+swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
+###  Network configuration sub-section  ######################
+### Basic network options: ###
+firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
+tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
+ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
+#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
+### Network daemons options: ###
+inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
+inetd_flags=""			# Optional flags to inetd
+snmpd_enable="NO"		# Run the SNMP daemon (or NO)
+snmpd_flags="-C -c /etc/snmpd.conf"	# Optional flags to snmpd
+### Network routing options: ###
+defaultrouter="NO"		# Set to default gateway (or NO).
+static_routes=""		# Set to static route list (or leave empty).
+gateway_enable="NO"		# Set to YES if this host will be a gateway.
+arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
+### Allow local configuration override at the very end here ##
+if [ -f /etc/rc.conf.local ]; then
+	. /etc/rc.conf.local
+fi
diff --git a/release/picobsd/isp/floppy.tree/etc/rc.firewall b/release/picobsd/floppy.tree/etc/rc.firewall
index 4ba5d30096bd..249218ef49fb 100644
--- a/release/picobsd/isp/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.1.1.1 1998/07/14 07:30:45 abial Exp $
+# $Id: rc.firewall,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/net/lang/rc.network.en b/release/picobsd/floppy.tree/etc/rc.network
index b6ffb6686186..5c58b4c20b64 100644
--- a/release/picobsd/net/lang/rc.network.en
+++ b/release/picobsd/floppy.tree/etc/rc.network
@@ -1,5 +1,5 @@
 #!/bin/sh -
-# $Id: rc.network.en,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
+# $Id: rc.network.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 network_pass1() {
     echo -n 'Doing initial network setup:'
     # Set the host name if it is not already set
diff --git a/release/picobsd/router/floppy.tree/etc/rc.serial b/release/picobsd/floppy.tree/etc/rc.serial
index 8e3f7268aea8..9eb1c8db1ae6 100644
--- a/release/picobsd/router/floppy.tree/etc/rc.serial
+++ b/release/picobsd/floppy.tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.serial,v 1.1 1998/08/02 13:03:31 abial Exp $
+# $Id: rc.serial,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/isp/floppy.tree/etc/remote b/release/picobsd/floppy.tree/etc/remote
index 6f9fcaf4ad5d..6f9fcaf4ad5d 100644
--- a/release/picobsd/isp/floppy.tree/etc/remote
+++ b/release/picobsd/floppy.tree/etc/remote
diff --git a/release/picobsd/floppy.tree/etc/resolv.conf b/release/picobsd/floppy.tree/etc/resolv.conf
new file mode 100644
index 000000000000..57a54e3ea70e
--- /dev/null
+++ b/release/picobsd/floppy.tree/etc/resolv.conf
@@ -0,0 +1,3 @@
+# $Id: resolv.conf.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+domain		mydomain.edu
+nameserver	192.33.4.12
diff --git a/release/picobsd/dial/floppy.tree/etc/services b/release/picobsd/floppy.tree/etc/services
index eec499fafec7..eec499fafec7 100644
--- a/release/picobsd/dial/floppy.tree/etc/services
+++ b/release/picobsd/floppy.tree/etc/services
diff --git a/release/picobsd/isp/floppy.tree/etc/shells b/release/picobsd/floppy.tree/etc/shells
index df377f133737..df377f133737 100644
--- a/release/picobsd/isp/floppy.tree/etc/shells
+++ b/release/picobsd/floppy.tree/etc/shells
diff --git a/release/picobsd/isp/floppy.tree/etc/snmpd.conf b/release/picobsd/floppy.tree/etc/snmpd.conf
index 29400dfb4b5e..29400dfb4b5e 100644
--- a/release/picobsd/isp/floppy.tree/etc/snmpd.conf
+++ b/release/picobsd/floppy.tree/etc/snmpd.conf
diff --git a/release/picobsd/dial/floppy.tree/etc/termcap b/release/picobsd/floppy.tree/etc/termcap
index 5a9316af0295..5a9316af0295 100644
--- a/release/picobsd/dial/floppy.tree/etc/termcap
+++ b/release/picobsd/floppy.tree/etc/termcap
diff --git a/release/picobsd/router/floppy.tree/etc/ttys b/release/picobsd/floppy.tree/etc/ttys
index 8ef5e6ebb37f..8ef5e6ebb37f 100644
--- a/release/picobsd/router/floppy.tree/etc/ttys
+++ b/release/picobsd/floppy.tree/etc/ttys
diff --git a/release/picobsd/dial/floppy.tree/kernel.config b/release/picobsd/floppy.tree/kernel.config
index e69de29bb2d1..e69de29bb2d1 100644
--- a/release/picobsd/dial/floppy.tree/kernel.config
+++ b/release/picobsd/floppy.tree/kernel.config
diff --git a/release/picobsd/isp/mfs.tree/Makefile b/release/picobsd/isp/Makefile.mfs
index 010abc5679d2..e32b2e1db19c 100644
--- a/release/picobsd/isp/mfs.tree/Makefile
+++ b/release/picobsd/isp/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:05 abial Exp $
+# $Id: Makefile,v 1.4 1999/06/14 15:42:47 roger Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/isp/conf/Makefile b/release/picobsd/isp/conf/Makefile
deleted file mode 100644
index af4b903f642e..000000000000
--- a/release/picobsd/isp/conf/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile,v 1.3 1998/10/15 21:40:01 abial Exp $
-#
-
-SRC?=/usr/src
-CONF?=$(SRC)/sys/i386/conf
-
-CONFFILE=PICOBSD${suffix}.${SIZE}
-COMPILE=$(SRC)/sys/compile/$(CONFFILE)
-KERNFILE=$(COMPILE)/kernel
-
-all: $(KERNFILE)
-
-$(KERNFILE): PICOBSD
-	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
-	(cd ${CONF}; \
-	config ${CONFFILE}; \
-	cd ${COMPILE}; \
-	make depend all)
-
diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD
deleted file mode 100644
index 084d24f31467..000000000000
--- a/release/picobsd/isp/conf/PICOBSD
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-# $Id: PICOBSD,v 1.11 1999/05/24 17:26:47 roger Exp $
-#
-
-machine		i386
-cpu		I386_CPU
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
-ident		PICOBSD
-maxusers	20
-
-options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-options		NFS			#Network Filesystem
-#options		BOOTP
-options		MFS			#Memory Filesystem
-options		MSDOSFS			#MSDOS Filesystem
-options		CD9660			#ISO 9660 Filesystem
-options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		USERCONFIG		#boot -c editor
-options		INTRO_USERCONFIG		#imply -c and parse info area
-options		VISUAL_USERCONFIG	#visual boot -c editor
-options		IPFIREWALL
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPDIVERT
-#options		DEVFS
-options		PCI_QUIET
-# Support for bridging and bandwidth limiting
-#options	DUMMYNET
-#options	BRIDGE
-
-controller	isa0
-controller	pci0
-
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
-
-controller	wdc0	at isa? port IO_WD1 irq 14
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
-
-controller	wdc1	at isa? port IO_WD2 irq 15
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
-
-device		wcd0	#IDE CD-ROM
-
-# atkbdc0 controlls both the keyboard and the PS/2 mouse
-controller	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-
-device		vga0	at isa? port ? conflicts
-
-# syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
-
-device		npx0	at nexus? port IO_NPX irq 13
-
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? port IO_COM3 irq 5
-device		sio3	at isa? port IO_COM4 irq 9
-
-# Support for multiport serial cards
-
-options	COM_MULTIPORT
-
-# AST
-
-device		sio4	at isa? port 0x2a0 flags 0x701
-device		sio5	at isa? port 0x2a8 flags 0x701
-device		sio6	at isa? port 0x2b0 flags 0x701
-device		sio7	at isa? port 0x2b8 flags 0x701 irq 12
-
-# Boca Board. You must configure the ports above with -c to change the flags.
-
-device		sio8	at isa? port 0x120 flags 0xb05
-device		sio9	at isa? port 0x128 flags 0xb05
-device		sio10	at isa? port 0x130 flags 0xb05
-device		sio11	at isa? port 0x138 flags 0xb05 irq 12
-
-# Hayes ESP boards
-
-options	COM_ESP
-
-# Comtrol Rocketport
-# The PCI versions
-#device	rp0
-#device	rp1
-# The ISA versions
-device	rp0	at isa? port 0x100
-device	rp1	at isa? port 0x180
-
-# Cyclades Cyclom-Y serial driver
-device cy0	at isa? irq 10 iomem 0xd4000 iosiz 0x2000
-device cy1	at isa? irq 11 iomem 0xd6000 iosiz 0x2000
-
-device ppc0	at isa? port? flags 0x40 irq 7
-controller	ppbus0
-device		lpt0	at ppbus?
-device		plip0	at ppbus?
-device		ppi0	at ppbus?
-
-#
-# The following Ethernet NICs are all PCI devices.
-#
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
-
-# Order is important here due to intrusive probes, do *not* alphabetize
-# this list of network interfaces until the probes have been fixed.
-# Right now it appears that the ie0 must be probed before ep0. See
-# revision 1.20 of this file.
-
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 5 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device lnc0 at isa? port 0x300 irq 10 drq 0
-
-pseudo-device	loop
-pseudo-device	ether
-# iijppp uses tun instead of ppp device
-pseudo-device	ppp	8
-pseudo-device	tun	2
-#pseudo-device	vn
-pseudo-device	pty	16
-#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/isp/crunch1/Makefile b/release/picobsd/isp/crunch1/Makefile
index eeb626fad359..959008d4cc57 100644
--- a/release/picobsd/isp/crunch1/Makefile
+++ b/release/picobsd/isp/crunch1/Makefile
@@ -1,24 +1,24 @@
 #
-# $Id: Makefile,v 1.3 1998/10/15 21:40:01 abial Exp $
+# $Id: Makefile,v 1.4 1999/01/19 23:10:34 abial Exp $
 #
 SRC?=/usr/src
 
 all: crunch
 
 crunch:
-	@if [ ! -f .patched ]; then \
+	@if [ ! -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		touch .patched; \
+		touch /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
-	@if [ -f .patched ]; then \
+	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		rm .patched; \
+		rm /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
diff --git a/release/picobsd/isp/floppy.tree/boot.config b/release/picobsd/isp/floppy.tree.exclude
index e69de29bb2d1..e69de29bb2d1 100644
--- a/release/picobsd/isp/floppy.tree/boot.config
+++ b/release/picobsd/isp/floppy.tree.exclude
diff --git a/release/picobsd/isp/floppy.tree/etc/fstab b/release/picobsd/isp/floppy.tree/etc/fstab
deleted file mode 100644
index 64d34ca9b1ae..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/fstab
+++ /dev/null
@@ -1,4 +0,0 @@
-#proc				/proc			procfs	rw 0 0
-#/dev/fd0c			/start_floppy		ufs	rw 1 1
-#/dev/wd0s1			/dos		msdos	rw 0 0
-#/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
diff --git a/release/picobsd/isp/floppy.tree/etc/group b/release/picobsd/isp/floppy.tree/etc/group
deleted file mode 100644
index abbd733f3b0b..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/group
+++ /dev/null
@@ -1,19 +0,0 @@
-wheel:*:0:root,user
-daemon:*:1:daemon
-kmem:*:2:root
-sys:*:3:root
-tty:*:4:root
-operator:*:5:root
-mail:*:6:
-bin:*:7:
-news:*:8:
-man:*:9:
-games:*:13:
-staff:*:20:root,user
-guest:*:31:root
-uucp:*:66:
-xten:*:67:xten
-dialer:*:68:
-network:*:69:
-nogroup:*:65533:
-nobody:*:65534:
diff --git a/release/picobsd/isp/floppy.tree/etc/host.conf b/release/picobsd/isp/floppy.tree/etc/host.conf
deleted file mode 100644
index 00fe5a2b2058..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/host.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: host.conf,v 1.1.1.1 1998/07/14 07:30:45 abial Exp $
-hosts
-bind
diff --git a/release/picobsd/isp/floppy.tree/etc/login.conf b/release/picobsd/isp/floppy.tree/etc/login.conf
deleted file mode 100644
index f98143a538c8..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/login.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-# This file controls resource limits, accounting limits and
-# default user environment settings.
-#
-#	$Id: login.conf,v 1.2 1999/01/12 14:09:20 asami Exp $
-#
-
-
-# Authentication methods
-
-auth-defaults:\
-	:auth=passwd:
-
-auth-root-defaults:\
-	:auth-login=passwd:\
-	:auth-rlogin=passwd:\
-
-auth-ftp-defaults:\
-	:auth=passwd:
-
-# Example defaults
-# These settings are used by login(1) by default for classless users
-# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
-
-default:\
-	:cputime=infinity:\
-	:datasize-cur=22M:\
-	:stacksize-cur=8M:\
-	:memorylocked-cur=10M:\
-	:memoryuse-cur=30M:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:maxproc-cur=64:\
-	:openfiles-cur=64:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-defaults:
-
-
-#
-# standard - standard user defaults
-#
-standard:\
-	:copyright=/etc/COPYRIGHT:\
-	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
-	:path=~/bin /bin /usr/bin:\
-	:nologin=/var/run/nologin:\
-	:cputime=1h30m:\
-	:datasize=8M:\
-	:stacksize=2M:\
-	:memorylocked=4M:\
-	:memoryuse=8M:\
-	:filesize=8M:\
-	:coredumpsize=8M:\
-	:openfiles=24:\
-	:maxproc=32:\
-	:priority=0:\
-	:requirehome:\
-	:passwordtime=90d:\
-	:umask=002:\
-	:ignoretime@:\
-	:tc=default:
-#
-# Staff users - few restrictions and allow login anytime
-#
-staff:\
-	:ignorenologin:\
-	:ignoretime:\
-	:requirehome@:\
-	:accounted@:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:umask=022:\
-	:tc=standard:
-
-
-#
-# root - fallback for root logins
-#
-root:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:cputime=infinity:\
-	:datasize=infinity:\
-	:stacksize=infinity:\
-	:memorylocked=infinity:\
-	:memoryuse=infinity:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:openfiles=infinity:\
-	:maxproc=infinity:\
-	:memoryuse-cur=32M:\
-	:maxproc-cur=64:\
-	:openfiles-cur=1024:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-root-defaults:\
-#
-# Settings used by /etc/rc
-#
-daemon:\
-	:coredumpsize@:\
-	:coredumpsize-cur=0:\
-	:datasize=infinity:\
-	:datasize-cur@:\
-	:maxproc=512:\
-	:maxproc-cur@:\
-	:memoryuse-cur=64M:\
-	:memorylocked-cur=64M:\
-	:openfiles=1024:\
-	:openfiles-cur@:\
-	:stacksize=16M:\
-	:stacksize-cur@:\
-	:tc=default:
-#
-# Polish Users Accounts. Setup proper environment variables.
-#
-polish:Polish Users Accounts:\
-	:lang=pl_pl.ISO-8859-2:\
-	:tc=default:
diff --git a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.deny b/release/picobsd/isp/floppy.tree/etc/ppp/ppp.deny
deleted file mode 100644
index 51e1e9bd03e3..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/ppp/ppp.deny
+++ /dev/null
@@ -1,15 +0,0 @@
-# list of users disallowed any pppd access via 'system
-# password login'.
-# read by pppd(8).
-root
-toor
-daemon
-operator
-bin
-games
-news
-man
-ftp
-uucp
-xten
-ingres
diff --git a/release/picobsd/isp/floppy.tree/etc/protocols b/release/picobsd/isp/floppy.tree/etc/protocols
deleted file mode 100644
index c80be39f693a..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/protocols
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Internet (IP) protocols
-ip	0	IP		# internet protocol, pseudo protocol number
-icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# Internet Group Management
-tcp	6	TCP		# transmission control protocol
-udp	17	UDP		# user datagram protocol
diff --git a/release/picobsd/isp/floppy.tree/etc/rc.serial b/release/picobsd/isp/floppy.tree/etc/rc.serial
deleted file mode 100644
index 840377b7c3d1..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/rc.serial
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-# $Id: rc.serial,v 1.1.1.1 1998/07/14 07:30:45 abial Exp $
-
-# Change some defaults for serial devices.
-# Standard defaults are:
-#	dtrwait 300 drainwait 0
-#	initial cflag from <sys/ttydefaults.h> = cread cs8 hupcl
-#	initial iflag, lflag and oflag all 0
-#	speed 9600
-#	special chars from <sys/ttydefaults.h>
-#	nothing locked
-# except for serial consoles the initial iflag, lflag and oflag are from
-# <sys/ttydefaults.h> and clocal is locked on.
-
-default() {
-	# Reset everything changed by the other functions to initial defaults.
-
-	ci=$1; shift	# call in device identifier
-	co=$1; shift	# call out device identifier
-
-	for i in $*
-	do
-		comcontrol /dev/tty$ci$i dtrwait 300 drainwait 0
-		stty </dev/ttyi$ci$i -clocal  crtscts  hupcl 9600 reprint ^R
-		stty </dev/ttyl$ci$i -clocal -crtscts -hupcl 0
-		stty </dev/cuai$co$i -clocal  crtscts  hupcl 9600 reprint ^R
-		stty </dev/cual$co$i -clocal -crtscts -hupcl 0
-	done
-}
-
-maybe() {
-	# Special settings.
-
-	ci=$1; shift
-	co=$1; shift
-
-	for i in $*
-	do
-		# Don't use ^R; it breaks bash's ^R when typed ahead.
-		stty </dev/ttyi$ci$i reprint undef
-		stty </dev/cuai$co$i reprint undef
-		# Lock clocal off on dialin device for security.
-		stty </dev/ttyl$ci$i clocal
-		# Lock the speeds to use old binaries that don't support them.
-		# Any legal speed works to lock the initial speed.
-		stty </dev/ttyl$ci$i 300
-		stty </dev/cual$co$i 300
-	done
-}
-
-modem() {
-	# Modem that supports CTS and perhaps RTS handshaking.
-
-	ci=$1; shift
-	co=$1; shift
-
-	for i in $*
-	do
-		# may depend on modem
-		comcontrol /dev/tty$ci$i dtrwait 100 drainwait 180
-		# Lock crtscts on.
-		# Speed reasonable for V42bis.
-		stty </dev/ttyi$ci$i crtscts 57600
-		stty </dev/ttyl$ci$i crtscts
-		stty </dev/cuai$co$i crtscts 57600
-		stty </dev/cual$co$i crtscts
-	done
-}
-
-mouse() {
-	# Mouse on either callin or callout port.
-
-	ci=$1; shift
-	co=$1; shift
-
-	for i in $*
-	do
-		# Lock clocal on, hupcl off.
-		# Standard speed for Microsoft mouse.
-		stty </dev/ttyi$ci$i clocal -hupcl 1200
-		stty </dev/ttyl$ci$i clocal  hupcl
-		stty </dev/cuai$co$i clocal -hupcl 1200
-		stty </dev/cual$co$i clocal  hupcl
-	done
-}
-
-terminal() {
-	# Terminal that supports CTS and perhaps RTS handshaking
-	# with the cable or terminal arranged so that DCD is on
-	# at least while the terminal is on.
-	# Also works for bidirectional communications to another pc
-	# provided at most one side runs getty.
-	# Same as modem() except we want a faster speed and no dtrwait.
-
-	ci=$1; shift
-	co=$1; shift
-
-	modem $ci $co $*
-	for i in $*
-	do
-		comcontrol /dev/tty$ci$i dtrwait 0
-		stty </dev/ttyi$ci$i 115200
-		stty </dev/cuai$co$i 115200
-	done
-}
-
-# Don't use anything from this file unless you have some buggy programs
-# that require it.
-
-# Edit the functions and the examples to suit your system.
-# $1 is the call in device identifier, $2 is the call out device identifier
-# and the remainder of the line lists the device numbers.
-
-# Initialize assorted 8250-16550 (sio) ports.
-# maybe    d a  0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
-# mouse    d a      2
-# modem    d a    1
-# terminal d a  0
-
-# Initialize all ports on a Cyclades-8yo.
-# modem    c c  00 01 02 03 04 05 06 07
-
-# Initialize all ports on a Cyclades-16ye.
-# modem    c c  00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 
-
-# Initialize all ports on a Digiboard 8.
-# modem    D D  00 01 02 03 04 05 06 07
diff --git a/release/picobsd/isp/floppy.tree/etc/services b/release/picobsd/isp/floppy.tree/etc/services
deleted file mode 100644
index eec499fafec7..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/services
+++ /dev/null
@@ -1,94 +0,0 @@
-echo	4/ddp
-echo	7/tcp
-echo	7/udp
-discard	9/tcp
-discard	9/udp
-systat	11/tcp
-systat	11/udp
-daytime	13/tcp
-daytime	13/udp
-qotd	17/tcp
-qotd	17/udp
-chargen	19/tcp
-chargen	19/udp
-ftp-data	20/tcp
-ftp-data	20/udp
-ftp	21/tcp
-ftp	21/udp
-ssh	22/tcp
-ssh	22/udp
-telnet	23/tcp
-telnet	23/udp
-smtp	25/tcp
-smtp	25/udp
-time	37/tcp
-time	37/udp
-domain	53/tcp
-domain	53/udp
-tacacs-ds	65/tcp
-tacacs-ds	65/udp
-bootps	67/tcp
-bootps	67/udp
-bootpc	68/tcp
-bootpc	68/udp
-tftp	69/tcp
-tftp	69/udp
-gopher	70/tcp
-gopher	70/udp
-finger	79/tcp
-finger	79/udp
-http	80/tcp
-http	80/udp
-pop2	109/tcp
-pop2	109/udp
-pop3	110/tcp
-pop3	110/udp
-uucp-path	117/tcp
-uucp-path	117/udp
-nntp	119/tcp
-nntp	119/udp
-netbios-ns	137/tcp
-netbios-ns	137/udp
-netbios-dgm	138/tcp
-netbios-dgm	138/udp
-netbios-ssn	139/tcp
-netbios-ssn	139/udp
-imap	143/tcp
-imap	143/udp
-snmp	161/tcp
-snmp	161/udp
-snmptrap	162/tcp
-snmptrap	162/udp
-bgp	179/tcp
-bgp	179/udp
-irc	194/tcp
-irc	194/udp
-ipx	213/tcp
-ipx	213/udp
-imap3	220/tcp
-imap3	220/udp
-ldap	389/tcp
-ldap	389/udp
-netware-ip	396/tcp
-netware-ip	396/udp
-https	443/tcp
-https	443/udp
-exec	512/tcp
-biff	512/udp
-login	513/tcp
-who	513/udp
-cmd	514/tcp
-syslog	514/udp
-printer	515/tcp
-printer	515/udp
-talk	517/tcp
-talk	517/udp
-ntalk	518/tcp
-ntalk	518/udp
-timed	525/tcp
-timed	525/udp
-uucp	540/tcp
-uucp	540/udp
-uucp-rlogin	541/tcp
-uucp-rlogin	541/udp
-natd		8668/divert # Network Address Translation
diff --git a/release/picobsd/isp/floppy.tree/etc/termcap b/release/picobsd/isp/floppy.tree/etc/termcap
deleted file mode 100644
index 5a9316af0295..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/termcap
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#	@(#)termcap.src	5.88 (Berkeley) 4/30/91
-#
-# 
-# for syscons
-# common entry without semigraphics
-cons25w|ansiw|ansi80x25-raw:\
-	:al=\E[L:am:bs:NP:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:co#80:\
-	:dc=\E[P:dl=\E[M:do=\E[B:bt=\E[Z:ho=\E[H:ic=\E[@:li#25:cb=\E[1K:\
-	:ms:nd=\E[C:pt:rs=\E[x\E[m\Ec:so=\E[7m:se=\E[m:up=\E[A:\
-	:pa#64:Co#8:Sf=\E[3%dm:Sb=\E[4%dm:op=\E[37;40m:\
-	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:\
-	:k9=\E[U:k;=\E[V:F1=\E[W:F2=\E[X:K2=\E[E:nw=\E[E:ec=\E[%dX:\
-	:kb=^H:kh=\E[H:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:le=^H:eo:sf=\E[S:sr=\E[T:\
-	:kN=\E[G:kP=\E[I:@7=\E[F:kI=\E[L:kD=\E[K:kB=\E[Z:\
-	:IC=\E[%d@:DC=\E[%dP:SF=\E[%dS:SR=\E[%dT:AL=\E[%dL:DL=\E[%dM:\
-	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:cv=\E[%i%dd:ch=\E[%i%d`:bw:\
-	:mb=\E[5m:md=\E[1m:mh=\E[30;1m:mr=\E[7m:me=\E[m:bl=^G:ut:it#8:
-cons25|ansis|ansi80x25:\
-	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\
-	:tc=cons25w:
-cons25-m|ansis-mono|ansi80x25-mono:\
-	:pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=cons25:
-cons50|ansil|ansi80x50:\
-	:li#50:tc=cons25:
-cons50-m|ansil-mono|ansi80x50-mono:\
-	:li#50:tc=cons25-m:
-# 80x25 ISO 8859-1 FreeBSD console
-cons25l1|cons25-iso8859-1:\
-	:ac=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.^Y-^X+\253,\273I\247y\232z\233:\
-	:tc=cons25w:
-cons25l1-m|cons25-iso8859-1-mono:\
-	:pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=cons25l1:
-# 80x50 ISO 8859-1 FreeBSD console
-cons50l1|cons50-iso8859-1:\
-	:li#50:tc=cons25l1:
-cons50l1-m|cons50-iso8859-1-mono:\
-	:li#50:tc=cons25l1-m:
-dosansi|ANSI.SYS standard crt|ansi:\
-	:am:bs:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:co#80:\
-	:do=\E[B:li#25:mi:nd=\E[C:\
-	:se=\E[m:so=\E[7m:up=\E[A:us=\E[4m:ue=\E[m:\
-	:md=\E[1m:mh=\E[m:mb=\E[5m:me=\E[m:\
-	:kh=\EG:kb=^h:ku=\EH:kd=\EP:kl=\EK:kr=\EM:\
-	:k1=\E;:k2=\E<:k3=\E=:k4=\E>:k5=\E?:\
-	:k6=\E@:k7=\EA:k8=\EB:k9=\EC:k0=\ED:
-
-# Note: this entry describes the "native"
-# capabilities of the PC monochrome display, without ANY emulation; most
-# communications packages (but NOT PC/IX connect) do some kind of emulation.
-pc|ibmpc|ibm pc PC/IX:\
-	:li#24: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:
-pc3mono|IBM PC 386BSD Console with monochrome monitor:\
-	:so=\E[0;1r\E[m:tc=pc3:
-pc3|ibmpc3|IBM PC 386BSD Console:\
-	:Co#8:\
-	:DO=\E[%dB:\
-	:F1=\E[W:\
-	:F2=\E[X:\
-	:K1=\E[H:\
-	:K2=\E[I:\
-	:K3=\E[E:\
-	:K4=\E[F:\
-	:K5=\E[G:\
-	:LE=\E[%dD:\
-	:RI=\E[%dC:\
-	:Sb=\E[1;%dx:\
-	:Sf=\E[2;%dx:\
-	:UP=\E[%dA:\
-	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\
-	:am:\
-	:bl=^G:\
-	:bs:\
-	:cb=\E[1K:\
-	:cd=\E[J:\
-	:ce=\E[K:\
-	:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:\
-	:co#80:\
-	:cr=^M:\
-	:do=\E[B:\
-	:ho=\E[H:\
-	:is=\E[m:\
-	:it#8:\
-	:k;=\E[V:\
-	:k1=\E[M:\
-	:k2=\E[N:\
-	:k3=\E[O:\
-	:k4=\E[P:\
-	:k5=\E[Q:\
-	:k6=\E[R:\
-	:k7=\E[S:\
-	:k8=\E[T:\
-	:k9=\E[U:\
-	:kD=\177:\
-	:@7=\E[F:\
-	:kN=\E[G:\
-	:kP=\E[I:\
-	:kb=\177:\
-	:kd=\E[B:\
-	:kh=\E[H:\
-	:kl=\E[D:\
-	:kr=\E[C:\
-	:ku=\E[A:\
-	:le=^H:\
-	:li#25:\
-	:ms:\
-	:nd=\E[C:\
-	:op=\E[x:\
-	:pa#64:\
-	:rs=\E[m:\
-	:se=\E[m:\
-	:sf=\E[S:\
-	:so=\E[7;1r\E[7m:\
-	:sr=\E[T:\
-	:ta=^I:\
-	:te=\E[m:\
-	:ti=\E[m:\
-	:up=\E[A:\
-	:ut:
diff --git a/release/picobsd/isp/floppy.tree/etc/ttys b/release/picobsd/isp/floppy.tree/etc/ttys
deleted file mode 100644
index 90a7b0a0503a..000000000000
--- a/release/picobsd/isp/floppy.tree/etc/ttys
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-#	@(#)ttys	5.1 (Berkeley) 4/17/89
-#
-# name	getty				type	status		comments
-#
-# This entry needed for asking password when init goes to single-user mode
-# If you want to be asked for password, change "secure" to "insecure" here
-vga	none				cons25	off secure
-#
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
-# Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv8	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv9	"/usr/libexec/getty Pc"		cons25	on  secure
-# Pseudo terminals
-ttyp0	none			network secure
-ttyp1	none			network secure
-ttyp2	none			network secure
-ttyp3	none			network
-ttyp4	none			network
-ttyp5	none			network
-ttyp6	none			network
-ttyp7	none			network
-ttyp8	none			network
-ttyp9	none			network
diff --git a/release/picobsd/isp/floppy.tree/kernel.config b/release/picobsd/isp/floppy.tree/kernel.config
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/release/picobsd/isp/floppy.tree/kernel.config
+++ /dev/null
diff --git a/release/picobsd/isp/lang/mfs.rc.en b/release/picobsd/isp/lang/mfs.rc.en
deleted file mode 100644
index 718345ac51bc..000000000000
--- a/release/picobsd/isp/lang/mfs.rc.en
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $Id: mfs.rc.en,v 1.3 1998/08/10 19:16:42 abial Exp $
-
-# System startup script run by init on autoboot
-# or after single-user.
-
-stty status '^T'
-
-trap : 2
-trap : 3	# shouldn't be needed
-
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-
-trap "echo 'Reboot interrupted'; exit 1" 3
-
-### Special setup for one floppy PICOBSD ###
-echo ""
-echo "-------------------------------------------"
-echo "  Please wait. The system is coming up..."
-echo "-------------------------------------------"
-echo ""
-echo "Reading /etc from startup floppy..."
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
-cd /etc
-pwd_mkdb -p ./master.passwd
-umount /start_floppy
-echo "Ok. (Now you may remove floppy if you like)"
-echo ""
-. rc
-exit 0
diff --git a/release/picobsd/isp/lang/mfs.rc.pl b/release/picobsd/isp/lang/mfs.rc.pl
deleted file mode 100644
index d3690934e342..000000000000
--- a/release/picobsd/isp/lang/mfs.rc.pl
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# $Id: mfs.rc.pl,v 1.3 1998/08/10 19:16:43 abial Exp $
-
-# System startup script run by init on autoboot
-# or after single-user.
-
-stty status '^T'
-
-trap : 2
-trap : 3	# shouldn't be needed
-
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-
-trap "echo 'Reboot zostal przerwany'; exit 1" 3
-
-############################################
-### Special setup for one floppy PICOBSD ###
-############################################
-echo ""
-echo "-----------------------------------------------"
-echo "  Prosze czekac. Trwa uruchamianie systemu..."
-echo "-----------------------------------------------"
-echo ""
-echo "Wczytuje konfiguracje /etc z dyskietki..."
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
-cd /etc
-pwd_mkdb -p ./master.passwd
-umount /dev/fd0a
-echo "Ok. (Jesli chcesz, mozesz juz wyjac dyskietke)"
-echo ""
-. rc
-exit 0
diff --git a/release/picobsd/isp/lang/rc.conf.en b/release/picobsd/isp/lang/rc.conf.en
deleted file mode 100644
index 036f6c525405..000000000000
--- a/release/picobsd/isp/lang/rc.conf.en
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.en,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
-swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.edu"	# Set this!
-firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network daemons options: ###
-inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
-inetd_flags=""			# Optional flags to inetd
-snmpd_enable="YES"		# Run the SNMP daemon (or NO)
-snmpd_flags="-C -c /etc/snmpd.conf"	# Optional flags to snmpd
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/isp/lang/rc.conf.pl b/release/picobsd/isp/lang/rc.conf.pl
deleted file mode 100644
index 28ef3981dc17..000000000000
--- a/release/picobsd/isp/lang/rc.conf.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.pl,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
-swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.org.pl"	# Set this!
-firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network daemons options: ###
-inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
-inetd_flags=""			# Optional flags to inetd
-snmpd_enable="YES"		# Run the SNMP daemon (or NO)
-snmpd_flags="-C -c /etc/snmpd.conf"	# Optional flags to snmpd
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/isp/lang/rc.network.en b/release/picobsd/isp/lang/rc.network.en
deleted file mode 100644
index e0abec2a1d6b..000000000000
--- a/release/picobsd/isp/lang/rc.network.en
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.en,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
-network_pass1() {
-    echo -n 'Doing initial network setup:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Load the filters if required
-    if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \
-    	"x$firewall_enable" = "xYES" ] ; then
-    		. /etc/rc.firewall
-    		echo "Firewall rules loaded."
-    else
-	    echo "Warning: kernel has firewall functionality, but firewall rules weren't loaded."
-	    echo "         All ip services are ENABLED by default."
-    fi
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Additional routing options:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' turning on ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/isp/lang/rc.network.pl b/release/picobsd/isp/lang/rc.network.pl
deleted file mode 100644
index 3aa476b1d07c..000000000000
--- a/release/picobsd/isp/lang/rc.network.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.pl,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
-network_pass1() {
-    echo -n 'Wstepna konfiguracja sieci:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Load the filters if required
-    if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \
-    	"x$firewall_enable" = "xYES" ] ; then
-    		. /etc/rc.firewall
-    		echo "Zaladowano reguly filtrujace do firewalla."
-    else
-	    echo "UWAGA: system posiada wbudowany modul firewalla, ale zadne reguly"
-	    echo "       filtrujace nie zostaly zaladowane."
-	    echo "       Wszystkie rodzaje ruchu IP sa dozwolone."
-    fi
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Dodatkowe opcje routingu:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' wlaczam ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/isp/lang/rc.pl b/release/picobsd/isp/lang/rc.pl
deleted file mode 100644
index 38e0e3156e1d..000000000000
--- a/release/picobsd/isp/lang/rc.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# $Id: rc.pl,v 1.3 1998/11/01 20:19:19 abial Exp $
-############################################
-### Special setup for one floppy PICOBSD ###
-### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
-############################################
-mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-rm -f /var/run/*
-if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then
-	echo "Dodaje $swapfile jako dodatkowy swap."
-	vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b
-fi
-# configure serial devices
-if [ -f /etc/rc.serial ]; then
-	. /etc/rc.serial
-fi
-# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
-	. /etc/rc.network
-	network_pass1
-fi
-mount -a -t nfs
-# clean up left-over files
-(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
-if [ -n "$network_pass1_done" ]; then
-    network_pass2
-fi
-if [ -n "$network_pass2_done" ]; then
-    network_pass3
-fi
-if [ "X${inetd_enable}" = X"YES" ]; then
-	echo "Uruchamiam inetd."; inetd ${inetd_flags}
-fi
-
-dev_mkdb
-
-echo ''
-if [ "x$swapfile" = "xNO" ]; then
-	echo "UWAGA: brak swapu!"
-	echo "Nie uruchamiaj zbyt wielu programow na raz..."
-fi
-echo ''
-echo ''
-echo '+------------ PicoBSD @VER@ (ISP) --------------+'
-echo '|                                              |'
-echo '| Zaloguj sie jako "root" (haslo "setup").     |'
-echo '|                                              |'
-echo '| Ta wersja PicoBSD w pelni podlega            |'
-echo '| licencji BSD. Po wiecej szczegolow zajrzyj   |'
-echo '| na http://www.freebsd.org/~picobsd, lub      |'
-echo '| skontaktuj sie z autorem.                    |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
-exit 0
diff --git a/release/picobsd/isp/lang/resolv.conf.en b/release/picobsd/isp/lang/resolv.conf.en
deleted file mode 100644
index 0002d884e6f8..000000000000
--- a/release/picobsd/isp/lang/resolv.conf.en
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.en,v 1.1.1.1 1998/07/14 07:30:46 abial Exp $
-domain		mydomain.edu
-nameserver	192.33.4.12
diff --git a/release/picobsd/isp/lang/resolv.conf.pl b/release/picobsd/isp/lang/resolv.conf.pl
deleted file mode 100644
index ed0a3f6d875e..000000000000
--- a/release/picobsd/isp/lang/resolv.conf.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.pl,v 1.1.1.1 1998/07/14 07:30:47 abial Exp $
-domain		mydomain.org.pl
-nameserver	148.81.16.51
diff --git a/release/picobsd/isp/mfs.tree/mfs.mtree b/release/picobsd/isp/mfs.mtree
index 1703df59b67c..2a6fc5075d2c 100644
--- a/release/picobsd/isp/mfs.tree/mfs.mtree
+++ b/release/picobsd/isp/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $Id: mfs.mtree,v 1.1.1.1 1998/07/14 07:30:47 abial Exp $
+# $Id: mfs.mtree,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/net/mfs.tree/Makefile b/release/picobsd/net/Makefile.mfs
index bbae94d20eb2..60a84dd81372 100644
--- a/release/picobsd/net/mfs.tree/Makefile
+++ b/release/picobsd/net/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/09/20 00:46:26 abial Exp $
+# $Id: Makefile,v 1.3 1999/05/05 08:37:43 abial Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/net/conf/PICOBSD b/release/picobsd/net/conf/PICOBSD
deleted file mode 100644
index 47b250cd8f09..000000000000
--- a/release/picobsd/net/conf/PICOBSD
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-#	$Id: PICOBSD,v 1.8.2.2 1999/02/15 02:49:24 des Exp $
-#
-
-machine		i386
-cpu		I386_CPU
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
-ident		PICOBSD
-maxusers	10
-
-options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-options		NFS			#Network Filesystem
-options		MFS			#Memory Filesystem
-options		MSDOSFS			#MSDOS Filesystem
-options		CD9660			#ISO 9660 Filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		USERCONFIG		#boot -c editor
-options		INTRO_USERCONFIG		#imply -c and parse info area
-options		VISUAL_USERCONFIG	#visual boot -c editor
-options		IPFIREWALL
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPDIVERT
-options		PCI_QUIET
-#options		DEVFS
-# Support for bridging and bandwidth limiting
-#options	DUMMYNET
-#options	BRIDGE
-
-controller	isa0
-controller	pci0
-
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
-
-controller	wdc0	at isa? port IO_WD1 irq 14
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
-
-controller	wdc1	at isa? port IO_WD2 irq 15
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
-
-device		wcd0	#IDE CD-ROM
-
-# atkbdc0 controlls both the keyboard and the PS/2 mouse
-controller	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-
-device		vga0	at isa? port ? conflicts
-
-# syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
-
-device		npx0	at nexus? port IO_NPX irq 13
-
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? disable port IO_COM3 irq 5
-device		sio3	at isa? disable port IO_COM4 irq 9
-
-device		ppc0	at isa? port? flags 0x40 irq 7
-controller	ppbus0
-device		lpt0	at ppbus?
-device		plip0	at ppbus?       
-device		ppi0	at ppbus?       
-
-#
-# The following Ethernet NICs are all PCI devices.
-#
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
-
-# Order is important here due to intrusive probes, do *not* alphabetize
-# this list of network interfaces until the probes have been fixed.
-# Right now it appears that the ie0 must be probed before ep0. See
-# revision 1.20 of this file.
-
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 10 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
-
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	tun	2
-#pseudo-device	vn
-pseudo-device	pty	16
-#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index 8ee9026bb125..339ce3222322 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -1,24 +1,24 @@
 #
-# $Id: Makefile,v 1.2 1998/10/15 21:40:03 abial Exp $
+# $Id: Makefile,v 1.3 1999/01/19 23:12:50 abial Exp $
 #
 SRC?=/usr/src
 
 all: crunch
 
 crunch:
-	@if [ ! -f .patched ]; then \
+	@if [ ! -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \
-		touch .patched; \
+		touch /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
-	@if [ -f .patched ]; then \
+	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
 		cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \
-		rm .patched; \
+		rm /usr/src/usr.bin/passwd/.picobsd.patched; \
 	fi
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
 		crunch.cache \
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 27ae9d38f476..9809a94c374a 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.5.2.3 1999/05/21 15:39:02 roger Exp $
+# $Id: crunch.conf,v 1.5.2.2 1999/05/07 10:03:06 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -41,4 +41,5 @@ ln chown chgrp
 
 libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias -lwrap
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
-libs -lgnuregex -ltelnet -lradius
+libs -lgnuregex -ltelnet
+libs -lradius # used by ppp
diff --git a/release/picobsd/net/crunch1/passwd.diff b/release/picobsd/net/crunch1/passwd.diff
index aa356f723185..16841119f763 100644
--- a/release/picobsd/net/crunch1/passwd.diff
+++ b/release/picobsd/net/crunch1/passwd.diff
@@ -1,48 +1,40 @@
-*** Makefile.orig	Sat Aug  1 20:39:04 1998
---- Makefile	Sat Aug  1 20:40:38 1998
 ***************
-*** 2,24 ****
-  # $Id: passwd.diff,v 1.2 1998/08/02 12:23:45 abial Exp $
+*** 2,20 ****
+  # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $
   
   PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
-! 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
+- SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
+- 	yp_passwd.c ypxfr_misc.c ${GENSRCS}
   GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
   	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall
+  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
   
-! DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-! LDADD=	-lcrypt -lrpcsvc -lutil
+- DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+- LDADD=	-lcrypt -lrpcsvc -lutil
   .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
-! 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
+- 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
+- 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
   
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
+- CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
   	-I${.CURDIR}/../../usr.sbin/vipw \
   	-I${.CURDIR}/../../usr.bin/chpass \
-- 	-I${.CURDIR}/../../libexec/ypxfr \
-- 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
---- 2,21 ----
-  # $Id: passwd.diff,v 1.2 1998/08/02 12:23:45 abial Exp $
+  	-I${.CURDIR}/../../libexec/ypxfr \
+--- 2,19 ----
+  # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $
   
   PROG=	passwd
-! SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c 
-! 
++ SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c
++ 
   GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
   	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
-  CFLAGS+=-Wall
+  CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS
   
-! DPADD=	${LIBCRYPT} ${LIBUTIL}
-! LDADD=	-lcrypt -lutil
++ DPADD=	${LIBCRYPT} ${LIBUTIL}
++ LDADD=	-lcrypt -lutil
   .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
-! 	${.CURDIR}/../rlogin 
++ 	${.CURDIR}/../rlogin
   
-! CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
++ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
   	-I${.CURDIR}/../../usr.sbin/vipw \
   	-I${.CURDIR}/../../usr.bin/chpass \
-  	-Dyp_error=warnx -DLOGGING
-  
-  CLEANFILES= ${GENSRCS}
+  	-I${.CURDIR}/../../libexec/ypxfr \
diff --git a/release/picobsd/net/floppy.tree/etc/host.conf b/release/picobsd/net/floppy.tree/etc/host.conf
index 07768737d4e9..c67b871b42b5 100644
--- a/release/picobsd/net/floppy.tree/etc/host.conf
+++ b/release/picobsd/net/floppy.tree/etc/host.conf
@@ -1,3 +1,3 @@
-# $Id: host.conf,v 1.1.1.1 1998/07/14 07:30:49 abial Exp $
+# $Id: host.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 hosts
 bind
diff --git a/release/picobsd/net/floppy.tree/etc/inetd.conf b/release/picobsd/net/floppy.tree/etc/inetd.conf
index 599a962820dd..c7c50de341e4 100644
--- a/release/picobsd/net/floppy.tree/etc/inetd.conf
+++ b/release/picobsd/net/floppy.tree/etc/inetd.conf
@@ -4,8 +4,6 @@
 #	@(#)inetd.conf	5.4 (Berkeley) 6/30/90
 #
 telnet	stream	tcp	nowait	root	/usr/libexec/telnetd	telnetd
-#tftp	dgram	udp	wait	nobody	/usr/libexec/tftpd	tftpd /tftpboot
-#bootps	dgram	udp	wait	root	/usr/libexec/bootpd	bootpd
 #
 # "Small servers" -- used to be standard on, but we're more conservative
 # about things due to Internet security concerns.  Only turn on what you
diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf
index c9596aa0efb1..17bfb137ab45 100644
--- a/release/picobsd/net/floppy.tree/etc/login.conf
+++ b/release/picobsd/net/floppy.tree/etc/login.conf
@@ -1,7 +1,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.2.2.1 1999/04/30 18:48:10 hoek Exp $
+#	$Id: login.conf,v 1.2.2.1 1999/04/30 18:48:09 hoek Exp $
 #
 
 
diff --git a/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf
index 68f5f55c0550..ed5da5dd72ce 100644
--- a/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf
+++ b/release/picobsd/net/floppy.tree/etc/ppp/ppp.conf
@@ -1,5 +1,5 @@
-# $Id: ppp.conf,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
 #  	PPP  Sample Configuration File
+#	  Written by Toshiharu OHNO
 default:
  set device /dev/cuaa1
  set speed 38400
diff --git a/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
index 9fa02ad56167..f61015b20ee0 100644
--- a/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
+++ b/release/picobsd/net/floppy.tree/etc/ppp/ppp.secret.sample
@@ -12,7 +12,7 @@
 #  required for all server socket connections.  Refer to the ppp(8)
 #  and pppctl(8) man pages for further details.
 #
-# $Id: ppp.secret.sample,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
+# $Id: ppp.secret.sample,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 ##################################################
 
diff --git a/release/picobsd/net/floppy.tree/etc/profile b/release/picobsd/net/floppy.tree/etc/profile
index b0aa3b20c38c..babb9333f494 100644
--- a/release/picobsd/net/floppy.tree/etc/profile
+++ b/release/picobsd/net/floppy.tree/etc/profile
@@ -1,4 +1,3 @@
 # System-wide .profile file for sh(1).
 BLOCKSIZE=K; export BLOCKSIZE
 PATH=/stand:.; export PATH
-set -o emacs
diff --git a/release/picobsd/net/floppy.tree/etc/rc.firewall b/release/picobsd/net/floppy.tree/etc/rc.firewall
index 8a5055d5701e..249218ef49fb 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/net/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.1.1.1 1998/07/14 07:30:49 abial Exp $
+# $Id: rc.firewall,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/net/floppy.tree/etc/rc.serial b/release/picobsd/net/floppy.tree/etc/rc.serial
index fe9491eca77e..9eb1c8db1ae6 100644
--- a/release/picobsd/net/floppy.tree/etc/rc.serial
+++ b/release/picobsd/net/floppy.tree/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.serial,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
+# $Id: rc.serial,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/release/picobsd/net/lang/mfs.rc.en b/release/picobsd/net/lang/mfs.rc.en
deleted file mode 100644
index c13166e76761..000000000000
--- a/release/picobsd/net/lang/mfs.rc.en
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# $Id: mfs.rc.en,v 1.3 1998/08/10 19:17:10 abial Exp $
-# System startup script run by init on autoboot
-# or after single-user.
-
-stty status '^T'
-
-trap : 2
-trap : 3	# shouldn't be needed
-
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-
-trap "echo 'Reboot interrupted'; exit 1" 3
-
-### Special setup for one floppy PICOBSD ###
-echo ""
-echo "-------------------------------------------"
-echo "  Please wait. The system is coming up..."
-echo "-------------------------------------------"
-echo ""
-echo "Reading /etc from startup floppy..."
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
-cd /etc
-pwd_mkdb -p ./master.passwd
-umount /start_floppy
-echo "Ok. (Now you may remove floppy if you like)"
-echo ""
-. rc
-exit 0
diff --git a/release/picobsd/net/lang/mfs.rc.pl b/release/picobsd/net/lang/mfs.rc.pl
deleted file mode 100644
index f5e0a53563e8..000000000000
--- a/release/picobsd/net/lang/mfs.rc.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# $Id: mfs.rc.pl,v 1.3 1998/08/10 19:17:10 abial Exp $
-# System startup script run by init on autoboot
-# or after single-user.
-
-stty status '^T'
-
-trap : 2
-trap : 3	# shouldn't be needed
-
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-
-trap "echo 'Reboot zostal przerwany'; exit 1" 3
-
-############################################
-### Special setup for one floppy PICOBSD ###
-############################################
-echo ""
-echo "-----------------------------------------------"
-echo "  Prosze czekac. Trwa uruchamianie systemu..."
-echo "-----------------------------------------------"
-echo ""
-echo "Wczytuje konfiguracje /etc z dyskietki..."
-mount -o rdonly /dev/fd0a /start_floppy
-cd /start_floppy/etc
-cp -Rp . /etc/
-cd /etc
-pwd_mkdb -p ./master.passwd
-umount /dev/fd0a
-echo "Ok. (Jesli chcesz, mozesz juz wyjac dyskietke)"
-echo ""
-. rc
-exit 0
diff --git a/release/picobsd/net/lang/rc.conf.en b/release/picobsd/net/lang/rc.conf.en
deleted file mode 100644
index 03d2bc6d664d..000000000000
--- a/release/picobsd/net/lang/rc.conf.en
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.en,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
-swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.edu"	# Set this!
-firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network daemons options: ###
-inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
-inetd_flags=""			# Optional flags to inetd
-snmpd_enable="YES"		# Run the SNMP daemon (or NO)
-snmpd_flags="-C -c /etc/snmpd.conf"	# Optional flags to snmpd
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/net/lang/rc.conf.pl b/release/picobsd/net/lang/rc.conf.pl
deleted file mode 100644
index 61c406667753..000000000000
--- a/release/picobsd/net/lang/rc.conf.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $Id: rc.conf.pl,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
-swapfile="NO"		# Set to name of swapfile if aux swapfile desired.
-###  Network configuration sub-section  ######################
-### Basic network options: ###
-hostname="pico.mydomain.org.pl"	# Set this!
-firewall="NO"			# firewall type (see /etc/rc.firewall) or NO
-tcp_extensions="NO"		# Allow RFC1323 & RFC1644 extensions (or NO).
-network_interfaces="lo0"	# List of network interfaces (lo0 is loopback).
-ifconfig_lo0="inet 127.0.0.1"	# default loopback device configuration.
-#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
-### Network daemons options: ###
-inetd_enable="YES"		# Run the network daemon dispatcher (or NO)
-inetd_flags=""			# Optional flags to inetd
-snmpd_enable="YES"		# Run the SNMP daemon (or NO)
-snmpd_flags="-C -c /etc/snmpd.conf"	# Optional flags to snmpd
-### Network routing options: ###
-defaultrouter="NO"		# Set to default gateway (or NO).
-static_routes=""		# Set to static route list (or leave empty).
-gateway_enable="NO"		# Set to YES if this host will be a gateway.
-arpproxy_all=""			# replaces obsolete kernel option ARP_PROXYALL.
-### Allow local configuration override at the very end here ##
-if [ -f /etc/rc.conf.local ]; then
-	. /etc/rc.conf.local
-fi
diff --git a/release/picobsd/net/lang/rc.en b/release/picobsd/net/lang/rc.en
deleted file mode 100644
index 295a882dfc7a..000000000000
--- a/release/picobsd/net/lang/rc.en
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# $Id: rc.en,v 1.4 1999/01/12 14:09:21 asami Exp $
-############################################
-### Special setup for one floppy PICOBSD ###
-### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
-############################################
-mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-rm -f /var/run/*
-if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then
-	echo "Adding $swapfile as additional swap."
-	vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b
-fi
-# configure serial devices
-if [ -f /etc/rc.serial ]; then
-	. /etc/rc.serial
-fi
-# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
-	. /etc/rc.network
-	network_pass1
-fi
-mount -a -t nfs
-chmod 666 /dev/tty[pqrsPQRS]*
-# clean up left-over files
-(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
-if [ -n "$network_pass1_done" ]; then
-    network_pass2
-fi
-if [ -n "$network_pass2_done" ]; then
-    network_pass3
-fi
-if [ "X${inetd_enable}" = X"YES" ]; then
-	echo "Starting inetd."; inetd ${inetd_flags}
-fi
-
-dev_mkdb
-
-echo ''
-if [ "x$swapfile" = "xNO" ]; then
-	echo "WARNING: no swap partition!"
-	echo "Don't run too many programs at the same time..."
-fi
-echo ''
-echo ''
-echo '+----------- PicoBSD @VER@ (NET) ---------------+'
-echo '|                                              |'
-echo '| Log in as "root" (password "setup").         |'
-echo '|                                              |'
-echo '| This version of PicoBSD is fully under       |'
-echo '| BSD license. For more details see            |'
-echo '| http://www.freebsd.org/~picobsd, or contact  |'
-echo '| the author.                                  |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
-exit 0
diff --git a/release/picobsd/net/lang/rc.network.pl b/release/picobsd/net/lang/rc.network.pl
deleted file mode 100644
index 9c0fab6bb65d..000000000000
--- a/release/picobsd/net/lang/rc.network.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network.pl,v 1.1.1.1 1998/07/14 07:30:50 abial Exp $
-network_pass1() {
-    echo -n 'Wstepna konfiguracja sieci:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Load the filters if required
-    if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \
-    	"x$firewall_enable" = "xYES" ] ; then
-    		. /etc/rc.firewall
-    		echo "Zaladowano reguly filtrujace do firewalla."
-    else
-	    echo "UWAGA: system posiada wbudowany modul firewalla, ale zadne reguly"
-	    echo "       filtrujace nie zostaly zaladowane."
-	    echo "       Wszystkie rodzaje ruchu IP sa dozwolone."
-    fi
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Dodatkowe opcje routingu:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' wlaczam ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/net/lang/rc.pl b/release/picobsd/net/lang/rc.pl
deleted file mode 100644
index d19f3367a6f2..000000000000
--- a/release/picobsd/net/lang/rc.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# $Id: rc.pl,v 1.3 1998/11/01 20:19:23 abial Exp $
-############################################
-### Special setup for one floppy PICOBSD ###
-### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
-############################################
-mount -a -t nonfs
-if [ -f /etc/rc.conf ]; then
-    . /etc/rc.conf
-fi
-rm -f /var/run/*
-if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then
-	echo "Dodaje $swapfile jako dodatkowy swap."
-	vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b
-fi
-# configure serial devices
-if [ -f /etc/rc.serial ]; then
-	. /etc/rc.serial
-fi
-# start up the initial network configuration.
-if [ -f /etc/rc.network ]; then
-	. /etc/rc.network
-	network_pass1
-fi
-mount -a -t nfs
-# clean up left-over files
-(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
-if [ -n "$network_pass1_done" ]; then
-    network_pass2
-fi
-if [ -n "$network_pass2_done" ]; then
-    network_pass3
-fi
-if [ "X${inetd_enable}" = X"YES" ]; then
-	echo "Uruchamiam inetd."; inetd ${inetd_flags}
-fi
-
-dev_mkdb
-
-echo ''
-if [ "x$swapfile" = "xNO" ]; then
-	echo "UWAGA: brak swapu!"
-	echo "Nie uruchamiaj zbyt wielu programow na raz..."
-fi
-echo ''
-echo ''
-echo '+------------ PicoBSD @VER@ (NET) --------------+'
-echo '|                                              |'
-echo '| Zaloguj sie jako "root" (haslo "setup").     |'
-echo '|                                              |'
-echo '| Ta wersja PicoBSD w pelni podlega            |'
-echo '| licencji BSD. Po wiecej szczegolow zajrzyj   |'
-echo '| na http://www.freebsd.org/~picobsd, lub      |'
-echo '| skontaktuj sie z autorem.                    |'
-echo '|                                              |'
-echo '|                     abial@freebsd.org        |'
-echo '|                                              |'
-echo '+----------------------------------------------+'
-exit 0
diff --git a/release/picobsd/net/lang/resolv.conf.en b/release/picobsd/net/lang/resolv.conf.en
deleted file mode 100644
index 1a7acfdf86d0..000000000000
--- a/release/picobsd/net/lang/resolv.conf.en
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.en,v 1.1.1.1 1998/07/14 07:30:51 abial Exp $
-domain		mydomain.edu
-nameserver	192.33.4.12
diff --git a/release/picobsd/net/lang/resolv.conf.pl b/release/picobsd/net/lang/resolv.conf.pl
deleted file mode 100644
index b2cb6499cf17..000000000000
--- a/release/picobsd/net/lang/resolv.conf.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: resolv.conf.pl,v 1.1.1.1 1998/07/14 07:30:51 abial Exp $
-domain		mydomain.org.pl
-nameserver	148.81.16.51
diff --git a/release/picobsd/net/mfs.tree/mfs.mtree b/release/picobsd/net/mfs.mtree
index 74e7f8ba321b..98d1262a7656 100644
--- a/release/picobsd/net/mfs.tree/mfs.mtree
+++ b/release/picobsd/net/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $Id: mfs.mtree,v 1.2 1998/08/02 12:24:38 abial Exp $
+# $Id: mfs.mtree,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/router/mfs.tree/Makefile b/release/picobsd/router/Makefile.mfs
index 620c6044239b..346c7df0030b 100644
--- a/release/picobsd/router/mfs.tree/Makefile
+++ b/release/picobsd/router/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:09 abial Exp $
+# $Id: Makefile,v 1.4 1999/06/14 15:45:56 roger Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/router/conf/Makefile b/release/picobsd/router/conf/Makefile
deleted file mode 100644
index bd33b5e9d02d..000000000000
--- a/release/picobsd/router/conf/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: Makefile,v 1.3 1998/10/15 21:40:05 abial Exp $
-#
-
-SRC?=/usr/src
-CONF?=$(SRC)/sys/i386/conf
-
-CONFFILE=PICOBSD${suffix}.${SIZE}
-COMPILE=$(SRC)/sys/compile/$(CONFFILE)
-KERNFILE=$(COMPILE)/kernel
-
-all: $(KERNFILE)
-
-$(KERNFILE): PICOBSD
-	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
-	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
-	(cd ${CONF}; \
-	config ${CONFFILE}; \
-	cd ${COMPILE}; \
-	make depend all)
-
diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD
deleted file mode 100644
index af95da64491e..000000000000
--- a/release/picobsd/router/conf/PICOBSD
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-#	$Id: PICOBSD,v 1.14 1999/05/24 17:27:30 roger Exp $
-#
-
-machine		i386
-cpu		I386_CPU
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
-ident		PICOBSD
-maxusers	10
-
-#options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-#options		NFS			#Network Filesystem
-options		MFS			#Memory Filesystem
-#options		MSDOSFS			#MSDOS Filesystem
-#options		CD9660			#ISO 9660 Filesystem
-#options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		USERCONFIG		#boot -c editor
-#options		USERCONFIG_BOOT		#imply -c and parse info area
-#options		VISUAL_USERCONFIG	#visual boot -c editor
-options		IPFIREWALL
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPDIVERT
-options		PCI_QUIET
-#options		DEVFS
-options		NO_SWAPPING
-# Support for bridging and bandwidth limiting
-#options	DUMMYNET
-#options	BRIDGE
-
-controller	isa0
-controller	pci0
-
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
-
-#controller	wdc0	at isa? port IO_WD1 irq 14
-#disk		wd0	at wdc0 drive 0
-#disk		wd1	at wdc0 drive 1
-
-#controller	wdc1	at isa? port IO_WD2 irq 15
-#disk		wd2	at wdc1 drive 0
-#disk		wd3	at wdc1 drive 1
-
-#device		wcd0	#IDE CD-ROM
-
-# atkbdc0 controlls both the keyboard and the PS/2 mouse
-controller	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-
-device		vga0	at isa? port ? conflicts
-
-# syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
-
-device		npx0	at nexus? port IO_NPX irq 13
-
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? disable port IO_COM3 irq 5
-device		sio3	at isa? disable port IO_COM4 irq 9
-
-#device ppc0	at isa? port? flags 0x40 irq 7
-#controller	ppbus0
-#device		lpt0	at ppbus?
-#device		plip0	at ppbus?
-#device		ppi0	at ppbus?
-
-#
-# The following Ethernet NICs are all PCI devices.
-#
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
-
-# Order is important here due to intrusive probes, do *not* alphabetize
-# this list of network interfaces until the probes have been fixed.
-# Right now it appears that the ie0 must be probed before ep0. See
-# revision 1.20 of this file.
-
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 10 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
-
-pseudo-device	loop
-pseudo-device	ether
-#pseudo-device	tun	2
-#pseudo-device	vn
-#pseudo-device bpf	4
-pseudo-device ppp 	4
-pseudo-device	pty	16
-#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/router/crunch1/Makefile b/release/picobsd/router/crunch1/Makefile
index 7115f9cd0568..2a3ce764ce1c 100644
--- a/release/picobsd/router/crunch1/Makefile
+++ b/release/picobsd/router/crunch1/Makefile
@@ -9,7 +9,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk NOSECURE=yes NOCRYPT=yes all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DRELEASE_CRUNCH" #2>&1 >/dev/null
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
diff --git a/release/picobsd/router/floppy.tree.exclude b/release/picobsd/router/floppy.tree.exclude
new file mode 100644
index 000000000000..8850a34dd83b
--- /dev/null
+++ b/release/picobsd/router/floppy.tree.exclude
@@ -0,0 +1,13 @@
+etc/inetd.conf
+etc/master.passwd
+etc/mfs.login.conf
+etc/mfs.rc
+etc/rc
+etc/rc.conf
+etc/rc.firewall
+etc/rc.network
+etc/rc.serial
+etc/remote
+etc/shells
+etc/snmpd.conf
+etc/ttys
diff --git a/release/picobsd/router/floppy.tree/boot.config b/release/picobsd/router/floppy.tree/boot.config
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/release/picobsd/router/floppy.tree/boot.config
+++ /dev/null
diff --git a/release/picobsd/router/floppy.tree/etc/disktab b/release/picobsd/router/floppy.tree/etc/disktab
deleted file mode 100644
index 7575ba66e088..000000000000
--- a/release/picobsd/router/floppy.tree/etc/disktab
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Floppy formats:
-#
-# To make a filesystem on a floppy:
-#	fdformat [-f <size>] fd<drive>[.<size>]
-#	disklabel -B -r -w fd<drive>[.<size>] fd<size>
-#	newfs <opts> fd<drive>[.<size>]
-#
-# with <opts>:
-#	-t 2	- two heads
-#	-u 9|15|18 - sectors per track
-#	(using the default value of 1/4096 is not much useful for floppies)
-#	-l 1	- interleave 1 (for most floppies)
-#	-i 65536 - bytes of data per i-node
-#	(the default -i value will render you with a floppy wasting way
-#	too much space in i-node areas)
-#
-
-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:
-
-fd1024|floppy0|3.5in Special Density Floppy:\
-	:ty=floppy:se#512:nt#2:rm#300:ns#16:nc#64:\
-	:pa#2048:oa#0:ba#4096:fa#512:\
-	:pb#2048:ob#0:bb#4096:fb#512:\
-	:pc#2048:oc#0:bc#4096:fc#512:
-
-# a == root
-# b == swap
-# c == d == whole disk
-# e == /var
-# f == scratch
-# h == /usr
-
-cp3100new|Connor Peripherals 100MB IDE, with a different configuration:\
-	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
-	:pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#24288:ob#15840:tb=swap: \
-	:pc#202224:oc#0: \
-	:pd#202224:od#0: \
-	:pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
-	:pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
-	:ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
-
-sony650|Sony 650 MB MOD|\
-	:ty=removable:dt=SCSI:se#512:nt#1:ns#31:nc#18600:ts#1:rm#4800:\
-	:pc#576600:oc#0:\
-	:pa#576600:oa#0:ta=4.2BSD:ba#8192:fa#1024:
-
-mta3230|mo230|IBM MTA-3230 230 Meg 3.5inch Magneto-Optical:\
-	:ty=removeable:dt=SCSI:rm#3600:\
-	:se#512:nt#64:ns#32:nc#216:sc#2048:su#444384:\
-	:pa#444384:oa#0:ba#4096:fa#0:ta=4.2BSD:\
-	:pc#444384:oc#0:
-
-minimum:ty=mfs:se#512:nt#1:rm#300:\
-	:ns#2880:nc#1:\
-	:pa#2880:oa#0:ba#4096:fa#512:\
-	:pc#2880:oc#0:bc#4096:fc#512:
-
-zip100|zip 100:\
-	:ty=removable:se#512:nc#96:nt#64:ns#32:\
-	:pa#196608:oa#0:ba#4096:fa#512:\
-	:pb#196608:ob#0:bb#4096:fb#512:\
-	:pc#196608:oc#0:bc#4096:fc#512:
-
diff --git a/release/picobsd/router/floppy.tree/etc/fstab b/release/picobsd/router/floppy.tree/etc/fstab
deleted file mode 100644
index 64d34ca9b1ae..000000000000
--- a/release/picobsd/router/floppy.tree/etc/fstab
+++ /dev/null
@@ -1,4 +0,0 @@
-#proc				/proc			procfs	rw 0 0
-#/dev/fd0c			/start_floppy		ufs	rw 1 1
-#/dev/wd0s1			/dos		msdos	rw 0 0
-#/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
diff --git a/release/picobsd/router/floppy.tree/etc/gettytab b/release/picobsd/router/floppy.tree/etc/gettytab
deleted file mode 100644
index 90562acf2505..000000000000
--- a/release/picobsd/router/floppy.tree/etc/gettytab
+++ /dev/null
@@ -1,40 +0,0 @@
-#	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
-#
-default:\
-	:cb:ce:ck:lc:fd#1000:cl:im=\r\nPicoBSD (%h) (%t)\r\n\r\n:sp#1200:
-
-P|Pc|Pc console:\
-	:ht:np:sp#115200:
-
-#
-# Fixed speed entries
-2|std.9600|9600-baud:\
-	:np:sp#9600:
-g|std.19200|19200-baud:\
-	:np:sp#19200:
-std.38400|38400-baud:\
-	:np:sp#38400:
-std.57600|57600-baud:\
-	:np:sp#57600:
-std.115200|115200-baud:\
-	:np:sp#115200:
-
-#
-# Entry specifying explicit device settings.  See termios(4) and
-# /usr/include/termios.h, too.  The entry forces the tty into
-# CLOCAL mode (so no DCD is required), and uses Xon/Xoff flow control.
-#
-# cflags: CLOCAL | HUPCL | CREAD | CS8
-# oflags: OPOST | ONLCR | OXTABS
-# iflags: IXOFF | IXON | ICRNL | IGNPAR
-# lflags: IEXTEN | ICANON | ISIG | ECHOCTL | ECHO | ECHOK | ECHOE | ECHOKE
-#
-# The `0' flags don't have input enabled.  The `1' flags don't echo.
-# (Echoing is done inside getty itself.)
-#
-local.9600|CLOCAL tty @ 9600 Bd:\
-	:c0#0x0000c300:c1#0x0000cb00:c2#0x0000cb00:\
-	:o0#0x00000007:o1#0x00000002:o2#0x00000007:\
-	:i0#0x00000704:i1#0x00000000:i2#0x00000704:\
-	:l0#0x000005cf:l1#0x00000000:l2#0x000005cf:\
-	:sp#9600:
diff --git a/release/picobsd/router/floppy.tree/etc/group b/release/picobsd/router/floppy.tree/etc/group
deleted file mode 100644
index abbd733f3b0b..000000000000
--- a/release/picobsd/router/floppy.tree/etc/group
+++ /dev/null
@@ -1,19 +0,0 @@
-wheel:*:0:root,user
-daemon:*:1:daemon
-kmem:*:2:root
-sys:*:3:root
-tty:*:4:root
-operator:*:5:root
-mail:*:6:
-bin:*:7:
-news:*:8:
-man:*:9:
-games:*:13:
-staff:*:20:root,user
-guest:*:31:root
-uucp:*:66:
-xten:*:67:xten
-dialer:*:68:
-network:*:69:
-nogroup:*:65533:
-nobody:*:65534:
diff --git a/release/picobsd/router/floppy.tree/etc/host.conf b/release/picobsd/router/floppy.tree/etc/host.conf
deleted file mode 100644
index cf4c538e02c3..000000000000
--- a/release/picobsd/router/floppy.tree/etc/host.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id: host.conf,v 1.1 1998/08/02 13:03:30 abial Exp $
-hosts
-bind
diff --git a/release/picobsd/router/floppy.tree/etc/mfs.rc b/release/picobsd/router/floppy.tree/etc/mfs.rc
new file mode 100644
index 000000000000..ccd644dfe330
--- /dev/null
+++ b/release/picobsd/router/floppy.tree/etc/mfs.rc
@@ -0,0 +1,25 @@
+# $Id: mfs.rc.en,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
+# This file is interpreted by oinit(8)
+#
+ncons 2
+motd /etc/motd
+set HOME=/
+set PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
+
+sysctl -w vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1
+
+### Special setup for one floppy PICOBSD ###
+echo
+echo "-------------------------------------------"
+echo "  Please wait. The system is coming up..."
+echo "-------------------------------------------"
+echo
+echo "Reading /etc from startup floppy..."
+mount -o rdonly /dev/fd0a /start_floppy
+cd /start_floppy/etc
+cp -Rp . /etc
+cd /etc
+umount /dev/fd0a
+echo "Ok. (Now you may remove floppy if you like)"
+echo
+. rc
diff --git a/release/picobsd/router/floppy.tree/etc/ppp/ppp.conf b/release/picobsd/router/floppy.tree/etc/ppp/ppp.conf
deleted file mode 100644
index 12e130af3584..000000000000
--- a/release/picobsd/router/floppy.tree/etc/ppp/ppp.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id: ppp.conf,v 1.1 1998/08/02 13:03:31 abial Exp $
-#  	PPP  Sample Configuration File
-default:
- set device /dev/cuaa1
- set speed 38400
- disable lqr
- deny lqr
- set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" ATE1Q0 OK-AT-OK \\dATDT\\T TIMEOUT 40 CONNECT"
diff --git a/release/picobsd/router/floppy.tree/etc/ppp/ppp.deny b/release/picobsd/router/floppy.tree/etc/ppp/ppp.deny
deleted file mode 100644
index 51e1e9bd03e3..000000000000
--- a/release/picobsd/router/floppy.tree/etc/ppp/ppp.deny
+++ /dev/null
@@ -1,15 +0,0 @@
-# list of users disallowed any pppd access via 'system
-# password login'.
-# read by pppd(8).
-root
-toor
-daemon
-operator
-bin
-games
-news
-man
-ftp
-uucp
-xten
-ingres
diff --git a/release/picobsd/router/floppy.tree/etc/ppp/ppp.linkup b/release/picobsd/router/floppy.tree/etc/ppp/ppp.linkup
deleted file mode 100644
index 05107c6df855..000000000000
--- a/release/picobsd/router/floppy.tree/etc/ppp/ppp.linkup
+++ /dev/null
@@ -1,10 +0,0 @@
-#          Example of ppp.linkup file
-#
-iij-demand:
- delete ALL
- add 0 0 HISADDR
-#
-# Otherwise, simply add peer as default gateway.
-#
-MYADDR:
- add 0 0 HISADDR
diff --git a/release/picobsd/router/floppy.tree/etc/ppp/ppp.secret.sample b/release/picobsd/router/floppy.tree/etc/ppp/ppp.secret.sample
deleted file mode 100644
index 0db95891a7eb..000000000000
--- a/release/picobsd/router/floppy.tree/etc/ppp/ppp.secret.sample
+++ /dev/null
@@ -1,23 +0,0 @@
-##################################################
-#
-#          Example of ppp.secret file
-#
-#  This file is used to authenticate incoming connections.
-#  You must ``enable'' either PAP or CHAP in your ppp.conf file.
-#  The peer may then use any of the Authname/Authkey pairs listed.
-#  If an IP address is given, it will be assigned to the peer.
-#  
-#  If an entry exists for your local machine (as given by the
-#  ``hostname -s'' command), the password specified will be
-#  required for all server socket connections.  Refer to the ppp(8)
-#  and pppctl(8) man pages for further details.
-#
-# $Id: ppp.secret.sample,v 1.1 1998/08/02 13:03:31 abial Exp $
-#
-##################################################
-
-# Authname	Authkey			Peer's IP address
-
-oscar		OurSecretKey		192.244.184.34/24
-BigBird		X4dWg9327		192.244.184.33/32
-tama		localPasswdForControl 
diff --git a/release/picobsd/router/floppy.tree/etc/profile b/release/picobsd/router/floppy.tree/etc/profile
deleted file mode 100644
index b0aa3b20c38c..000000000000
--- a/release/picobsd/router/floppy.tree/etc/profile
+++ /dev/null
@@ -1,4 +0,0 @@
-# System-wide .profile file for sh(1).
-BLOCKSIZE=K; export BLOCKSIZE
-PATH=/stand:.; export PATH
-set -o emacs
diff --git a/release/picobsd/router/floppy.tree/etc/protocols b/release/picobsd/router/floppy.tree/etc/protocols
deleted file mode 100644
index c80be39f693a..000000000000
--- a/release/picobsd/router/floppy.tree/etc/protocols
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Internet (IP) protocols
-ip	0	IP		# internet protocol, pseudo protocol number
-icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# Internet Group Management
-tcp	6	TCP		# transmission control protocol
-udp	17	UDP		# user datagram protocol
diff --git a/release/picobsd/router/floppy.tree/etc/rc.firewall b/release/picobsd/router/floppy.tree/etc/rc.firewall
index 0a3e3d2f7c95..249218ef49fb 100644
--- a/release/picobsd/router/floppy.tree/etc/rc.firewall
+++ b/release/picobsd/router/floppy.tree/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.1 1998/08/02 13:03:31 abial Exp $
+# $Id: rc.firewall,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 
 ############
 # Define the firewall type in /etc/rc.conf.  Valid values are:
diff --git a/release/picobsd/router/floppy.tree/etc/rc.network b/release/picobsd/router/floppy.tree/etc/rc.network
deleted file mode 100644
index 7c2abf43531f..000000000000
--- a/release/picobsd/router/floppy.tree/etc/rc.network
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh -
-# $Id: rc.network,v 1.2 1998/08/10 19:17:49 abial Exp $
-network_pass1() {
-    echo -n 'Wstepna konfiguracja sieci:'
-    # Set the host name if it is not already set
-    if [ -z "`hostname -s`" ] ; then
-	    hostname $hostname
-	    echo ' hostname'
-    fi
-    # Set up all the network interfaces, calling startup scripts if needed
-    for ifn in ${network_interfaces}; do
-	    if [ -e /etc/start_if.${ifn} ]; then
-		    . /etc/start_if.${ifn}
-	    fi
-	    # Do the primary ifconfig if specified
-	    eval ifconfig_args=\$ifconfig_${ifn}
-	    if [ -n "${ifconfig_args}" ] ; then
-		    ifconfig ${ifn} ${ifconfig_args}
-	    fi
-	    # Check to see if aliases need to be added
-	    alias=0
-	    while :
-	    do
-		    eval ifconfig_args=\$ifconfig_${ifn}_alias${alias}
-		    if [ -n "${ifconfig_args}" ]; then
-			    ifconfig ${ifn} ${ifconfig_args} alias
-			    alias=`expr ${alias} + 1`
-		    else
-			    break;
-		    fi
-	    done
-	    ifconfig ${ifn}
-    done
-    # Load the filters if required
-    if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \
-    	"x$firewall_enable" = "xYES" ] ; then
-    		. /etc/rc.firewall
-    		echo "Zaladowano reguly filtrujace do firewalla."
-    else
-	    echo "UWAGA: system posiada wbudowany modul firewalla, ale zadne reguly"
-	    echo "       filtrujace nie zostaly zaladowane."
-	    echo "       Wszystkie rodzaje ruchu IP sa dozwolone."
-    fi
-    # Configure routing
-    if [ "x$defaultrouter" != "xNO" ] ; then
-	    static_routes="default ${static_routes}"
-	    route_default="default ${defaultrouter}"
-    fi
-    # Set up any static routes.  This should be done before router discovery.
-    if [ "x${static_routes}" != "x" ]; then
-	    for i in ${static_routes}; do
-		    eval route_args=\$route_${i}
-		    route add ${route_args}
-	    done
-    fi
-    echo -n 'Dodatkowe opcje routingu:'
-    if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
-	    echo -n ' tcp_extensions=NO'
-	    sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
-	    sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
-    fi
-    if [ "X$gateway_enable" = X"YES" ]; then
-	    echo -n ' IP_gateway=YES'
-	    sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
-    fi
-    if [ "X$arpproxy_all" = X"YES" ]; then
-	    echo -n ' wlaczam ARP_PROXY_ALL: '
-	    sysctl -w net.link.ether.inet.proxyall=1 2>&1
-    fi
-    echo '.'
-    network_pass1_done=YES	# Let future generations know we made it.
-}
-
-network_pass2() {
-    network_pass2_done=YES
-}
-
-network_pass3() {
-    network_pass3_done=YES
-}
diff --git a/release/picobsd/router/floppy.tree/etc/remote b/release/picobsd/router/floppy.tree/etc/remote
deleted file mode 100644
index 6f9fcaf4ad5d..000000000000
--- a/release/picobsd/router/floppy.tree/etc/remote
+++ /dev/null
@@ -1,50 +0,0 @@
-#	@(#)remote	5.2 (Berkeley) 6/30/90
-#
-# remote -- remote host description file
-# see tip(1), remote(5)
-#
-# dv	device to use for the tty
-# el	EOL marks (default is NULL)
-# du	make a call flag (dial up)
-# pn	phone numbers (@ =>'s search phones file; possibly taken from
-#	PHONES environment variable)
-# at	ACU type
-# ie	input EOF marks (default is NULL)
-# oe	output EOF string (default is NULL)
-# cu	call unit (default is dv)
-# br	baud rate (defaults to 300)
-# fs	frame size (default is BUFSIZ) -- used in buffering writes on
-#	receive operations
-# tc	to continue a capability
-
-# Systems definitions
-netcom|Netcom Unix Access:\
-	:pn=\@:tc=unix1200:
-omen|Omen BBS:\
-	:pn=\@:tc=dos1200:
-
-# UNIX system definitions
-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 a UNIX system:\
-	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial300:
-
-# DOS system definitions
-dos1200|1200 Baud dial-out to a DOS system:\
-	:el=^U^C^R^O^D^S^Q:ie=%$:oe=^Z:pa=none:tc=dial1200:
-
-# General dialer definitions used below
-#
-# COURIER switch settings:
-# switch:	1 2 3 4 5 6 7 8 9 10
-# setting:	D U D U D D U D U U
-# Rackmount:	U U D U D U D D U D
-#
-dial2400|2400 Baud Hayes attributes:\
-	:dv=/dev/cuaa0:br#2400:cu=/dev/cuaa0:at=hayes:du:
-dial1200|1200 Baud Hayes attributes:\
-	:dv=/dev/cuaa0:br#1200:cu=/dev/cuaa0:at=hayes:du:
-
-# Hardwired line
-cuaa0b|cua0b:dv=/dev/cuaa0:br#2400
-cuaa0c|cua0c:dv=/dev/cuaa0:br#9600
diff --git a/release/picobsd/router/floppy.tree/etc/services b/release/picobsd/router/floppy.tree/etc/services
deleted file mode 100644
index eec499fafec7..000000000000
--- a/release/picobsd/router/floppy.tree/etc/services
+++ /dev/null
@@ -1,94 +0,0 @@
-echo	4/ddp
-echo	7/tcp
-echo	7/udp
-discard	9/tcp
-discard	9/udp
-systat	11/tcp
-systat	11/udp
-daytime	13/tcp
-daytime	13/udp
-qotd	17/tcp
-qotd	17/udp
-chargen	19/tcp
-chargen	19/udp
-ftp-data	20/tcp
-ftp-data	20/udp
-ftp	21/tcp
-ftp	21/udp
-ssh	22/tcp
-ssh	22/udp
-telnet	23/tcp
-telnet	23/udp
-smtp	25/tcp
-smtp	25/udp
-time	37/tcp
-time	37/udp
-domain	53/tcp
-domain	53/udp
-tacacs-ds	65/tcp
-tacacs-ds	65/udp
-bootps	67/tcp
-bootps	67/udp
-bootpc	68/tcp
-bootpc	68/udp
-tftp	69/tcp
-tftp	69/udp
-gopher	70/tcp
-gopher	70/udp
-finger	79/tcp
-finger	79/udp
-http	80/tcp
-http	80/udp
-pop2	109/tcp
-pop2	109/udp
-pop3	110/tcp
-pop3	110/udp
-uucp-path	117/tcp
-uucp-path	117/udp
-nntp	119/tcp
-nntp	119/udp
-netbios-ns	137/tcp
-netbios-ns	137/udp
-netbios-dgm	138/tcp
-netbios-dgm	138/udp
-netbios-ssn	139/tcp
-netbios-ssn	139/udp
-imap	143/tcp
-imap	143/udp
-snmp	161/tcp
-snmp	161/udp
-snmptrap	162/tcp
-snmptrap	162/udp
-bgp	179/tcp
-bgp	179/udp
-irc	194/tcp
-irc	194/udp
-ipx	213/tcp
-ipx	213/udp
-imap3	220/tcp
-imap3	220/udp
-ldap	389/tcp
-ldap	389/udp
-netware-ip	396/tcp
-netware-ip	396/udp
-https	443/tcp
-https	443/udp
-exec	512/tcp
-biff	512/udp
-login	513/tcp
-who	513/udp
-cmd	514/tcp
-syslog	514/udp
-printer	515/tcp
-printer	515/udp
-talk	517/tcp
-talk	517/udp
-ntalk	518/tcp
-ntalk	518/udp
-timed	525/tcp
-timed	525/udp
-uucp	540/tcp
-uucp	540/udp
-uucp-rlogin	541/tcp
-uucp-rlogin	541/udp
-natd		8668/divert # Network Address Translation
diff --git a/release/picobsd/router/floppy.tree/etc/shells b/release/picobsd/router/floppy.tree/etc/shells
deleted file mode 100644
index df377f133737..000000000000
--- a/release/picobsd/router/floppy.tree/etc/shells
+++ /dev/null
@@ -1,6 +0,0 @@
-# List of acceptable shells for chpass(1).
-# Ftpd will not allow users to connect who are not using
-# one of these shells.
-
-/bin/sh
-/bin/csh
diff --git a/release/picobsd/router/floppy.tree/etc/termcap b/release/picobsd/router/floppy.tree/etc/termcap
deleted file mode 100644
index 5a9316af0295..000000000000
--- a/release/picobsd/router/floppy.tree/etc/termcap
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#	@(#)termcap.src	5.88 (Berkeley) 4/30/91
-#
-# 
-# for syscons
-# common entry without semigraphics
-cons25w|ansiw|ansi80x25-raw:\
-	:al=\E[L:am:bs:NP:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:co#80:\
-	:dc=\E[P:dl=\E[M:do=\E[B:bt=\E[Z:ho=\E[H:ic=\E[@:li#25:cb=\E[1K:\
-	:ms:nd=\E[C:pt:rs=\E[x\E[m\Ec:so=\E[7m:se=\E[m:up=\E[A:\
-	:pa#64:Co#8:Sf=\E[3%dm:Sb=\E[4%dm:op=\E[37;40m:\
-	:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:\
-	:k9=\E[U:k;=\E[V:F1=\E[W:F2=\E[X:K2=\E[E:nw=\E[E:ec=\E[%dX:\
-	:kb=^H:kh=\E[H:ku=\E[A:kd=\E[B:kl=\E[D:kr=\E[C:le=^H:eo:sf=\E[S:sr=\E[T:\
-	:kN=\E[G:kP=\E[I:@7=\E[F:kI=\E[L:kD=\E[K:kB=\E[Z:\
-	:IC=\E[%d@:DC=\E[%dP:SF=\E[%dS:SR=\E[%dT:AL=\E[%dL:DL=\E[%dM:\
-	:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:cv=\E[%i%dd:ch=\E[%i%d`:bw:\
-	:mb=\E[5m:md=\E[1m:mh=\E[30;1m:mr=\E[7m:me=\E[m:bl=^G:ut:it#8:
-cons25|ansis|ansi80x25:\
-	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\
-	:tc=cons25w:
-cons25-m|ansis-mono|ansi80x25-mono:\
-	:pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=cons25:
-cons50|ansil|ansi80x50:\
-	:li#50:tc=cons25:
-cons50-m|ansil-mono|ansi80x50-mono:\
-	:li#50:tc=cons25-m:
-# 80x25 ISO 8859-1 FreeBSD console
-cons25l1|cons25-iso8859-1:\
-	:ac=l\215m\216k\214j\213u\226t\225v\227w\230q\222x\231n\217o\220s\224p\221r\223`\201a\202f\207g\210~\237.^Y-^X+\253,\273I\247y\232z\233:\
-	:tc=cons25w:
-cons25l1-m|cons25-iso8859-1-mono:\
-	:pa@:Co@:Sf@:Sb@:op@:us=\E[4m:ue=\E[m:md@:mh@:tc=cons25l1:
-# 80x50 ISO 8859-1 FreeBSD console
-cons50l1|cons50-iso8859-1:\
-	:li#50:tc=cons25l1:
-cons50l1-m|cons50-iso8859-1-mono:\
-	:li#50:tc=cons25l1-m:
-dosansi|ANSI.SYS standard crt|ansi:\
-	:am:bs:ce=\E[K:cl=\E[2J:cm=\E[%i%d;%dH:co#80:\
-	:do=\E[B:li#25:mi:nd=\E[C:\
-	:se=\E[m:so=\E[7m:up=\E[A:us=\E[4m:ue=\E[m:\
-	:md=\E[1m:mh=\E[m:mb=\E[5m:me=\E[m:\
-	:kh=\EG:kb=^h:ku=\EH:kd=\EP:kl=\EK:kr=\EM:\
-	:k1=\E;:k2=\E<:k3=\E=:k4=\E>:k5=\E?:\
-	:k6=\E@:k7=\EA:k8=\EB:k9=\EC:k0=\ED:
-
-# Note: this entry describes the "native"
-# capabilities of the PC monochrome display, without ANY emulation; most
-# communications packages (but NOT PC/IX connect) do some kind of emulation.
-pc|ibmpc|ibm pc PC/IX:\
-	:li#24: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:
-pc3mono|IBM PC 386BSD Console with monochrome monitor:\
-	:so=\E[0;1r\E[m:tc=pc3:
-pc3|ibmpc3|IBM PC 386BSD Console:\
-	:Co#8:\
-	:DO=\E[%dB:\
-	:F1=\E[W:\
-	:F2=\E[X:\
-	:K1=\E[H:\
-	:K2=\E[I:\
-	:K3=\E[E:\
-	:K4=\E[F:\
-	:K5=\E[G:\
-	:LE=\E[%dD:\
-	:RI=\E[%dC:\
-	:Sb=\E[1;%dx:\
-	:Sf=\E[2;%dx:\
-	:UP=\E[%dA:\
-	:ac=l\332m\300k\277j\331u\264t\303v\301w\302q\304x\263n\305`^Da\260f\370g\361~\371.^Y-^Xh\261I^U0\333y\363z\362:\
-	:am:\
-	:bl=^G:\
-	:bs:\
-	:cb=\E[1K:\
-	:cd=\E[J:\
-	:ce=\E[K:\
-	:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:\
-	:co#80:\
-	:cr=^M:\
-	:do=\E[B:\
-	:ho=\E[H:\
-	:is=\E[m:\
-	:it#8:\
-	:k;=\E[V:\
-	:k1=\E[M:\
-	:k2=\E[N:\
-	:k3=\E[O:\
-	:k4=\E[P:\
-	:k5=\E[Q:\
-	:k6=\E[R:\
-	:k7=\E[S:\
-	:k8=\E[T:\
-	:k9=\E[U:\
-	:kD=\177:\
-	:@7=\E[F:\
-	:kN=\E[G:\
-	:kP=\E[I:\
-	:kb=\177:\
-	:kd=\E[B:\
-	:kh=\E[H:\
-	:kl=\E[D:\
-	:kr=\E[C:\
-	:ku=\E[A:\
-	:le=^H:\
-	:li#25:\
-	:ms:\
-	:nd=\E[C:\
-	:op=\E[x:\
-	:pa#64:\
-	:rs=\E[m:\
-	:se=\E[m:\
-	:sf=\E[S:\
-	:so=\E[7;1r\E[7m:\
-	:sr=\E[T:\
-	:ta=^I:\
-	:te=\E[m:\
-	:ti=\E[m:\
-	:up=\E[A:\
-	:ut:
diff --git a/release/picobsd/router/floppy.tree/kernel.config b/release/picobsd/router/floppy.tree/kernel.config
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/release/picobsd/router/floppy.tree/kernel.config
+++ /dev/null
diff --git a/release/picobsd/router/mfs.tree/mfs.mtree b/release/picobsd/router/mfs.mtree
index 8fd9af3e571d..33798e7d868b 100644
--- a/release/picobsd/router/mfs.tree/mfs.mtree
+++ b/release/picobsd/router/mfs.mtree
@@ -1,5 +1,5 @@
 #
-# $Id: mfs.mtree,v 1.2 1998/08/10 19:17:57 abial Exp $
+# $Id: mfs.mtree,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
 #
 /set type=dir uname=root gname=wheel mode=0755
 .              
diff --git a/release/picobsd/tinyware/ns/ns.c b/release/picobsd/tinyware/ns/ns.c
index 7f3db556cbc6..05c561e43479 100644
--- a/release/picobsd/tinyware/ns/ns.c
+++ b/release/picobsd/tinyware/ns/ns.c
@@ -135,15 +135,11 @@ sock_ntop(const struct sockaddr *sa, size_t salen)
 	}
 	case AF_LINK: {
 		struct sockaddr_dl *sdl = (struct sockaddr_dl *) sa;
-		int l = sdl->sdl_nlen ;
 
-		if (l >= sizeof(str) )
-			l = sizeof(str) - 1 ;
-
-		if (l > 0) {
-			strncpy(str, &sdl->sdl_data[0], l);
-			str[l] = '\0';
-		} else
+		if (sdl->sdl_nlen > 0)
+			snprintf(str, sizeof(str), "%*s",
+				 sdl->sdl_nlen, &sdl->sdl_data[0]);
+		else
 			snprintf(str, sizeof(str), "link#%d", sdl->sdl_index);
 		return(str);
 	}
@@ -307,15 +303,16 @@ print_routing(char *proto)
 	    printf("----------------\n");
 	    printf("Name  Mtu   Network       Address            "
 		    "Ipkts Ierrs    Opkts Oerrs  Coll\n");
-	    i=0;
-	    for(next=if_buf;next<lim;next+=ifm->ifm_msglen) {
+	}
+	i=0;
+	for(next=if_buf;next<lim;next+=ifm->ifm_msglen) {
 
 		ifm=(struct if_msghdr *)next;
 		if_table[i]=(struct sockaddr *)(ifm+1);
 		ifm_table[i]=ifm;
 
 		sa = if_table[i];
-		if (sa->sa_family == AF_LINK) {
+		if (iflag && sa->sa_family == AF_LINK) {
 		    struct sockaddr_dl *sdl = (struct sockaddr_dl *) sa;
 
 		    printf("%-4s  %-5d <Link>   ",
@@ -336,7 +333,6 @@ print_routing(char *proto)
 			);
 		}
 		i++;
-	    }
 	}
 	if (!rflag) {
 		free(rt_buf);
diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile
index 626f1c18ca49..34864a5fc7b8 100644
--- a/release/picobsd/tinyware/simple_httpd/Makefile
+++ b/release/picobsd/tinyware/simple_httpd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/02/12 20:36:13 abial Exp $
+#	$Id: Makefile,v 1.2.2.2 1999/05/05 07:31:31 abial Exp $
 #
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
diff --git a/release/picobsd/tinyware/simple_httpd/README b/release/picobsd/tinyware/simple_httpd/README
index eafeb26d637a..be4d7d97fd6c 100644
--- a/release/picobsd/tinyware/simple_httpd/README
+++ b/release/picobsd/tinyware/simple_httpd/README
@@ -164,4 +164,4 @@ This program was originally contributed by Marc Nicholas <marc@netstor.com>
 
 Major rewrite by William Lloyd <wlloyd@slap.net>
 
-$Id:$
+$Id: README,v 1.2.2.2 1999/05/05 07:31:32 abial Exp $
diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
index ddb593baebfd..388623548a4a 100644
--- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c
+++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id:$
+ *	$Id: simple_httpd.c,v 1.2.2.2 1999/05/05 07:31:33 abial Exp $
  */
 
 #include <sys/stat.h>
diff --git a/release/picobsd/tinyware/vm/vm.c b/release/picobsd/tinyware/vm/vm.c
index 4babb246aafb..8e089d8916cf 100644
--- a/release/picobsd/tinyware/vm/vm.c
+++ b/release/picobsd/tinyware/vm/vm.c
@@ -26,14 +26,13 @@
  *	$Id: vm.c,v 1.2 1998/10/29 12:38:06 abial Exp $
  */
 
+#include <stdio.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
-
 #include <vm/vm_param.h>
 
-#include <stdio.h>
+#define pgtok(a) ((a) * (u_int) DEFAULT_PAGE_SIZE >> 10)
 
 int
 main(int argc, char *argv[])