4 files changed, 140 insertions, 74 deletions

diff --git a/release/picobsd/router/Makefile.mfs b/release/picobsd/router/Makefile.mfs
index 8413893fb365..becfb33d2f17 100644
--- a/release/picobsd/router/Makefile.mfs
+++ b/release/picobsd/router/Makefile.mfs
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.mfs,v 1.1 1999/08/22 21:44:42 dwhite Exp $
+# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:09 abial Exp $
 #
 
 DESTDIR?=/mnt
diff --git a/release/picobsd/router/PICOBSD b/release/picobsd/router/PICOBSD
index 6e08b7bda806..a82fce28f002 100644
--- a/release/picobsd/router/PICOBSD
+++ b/release/picobsd/router/PICOBSD
@@ -1,12 +1,12 @@
 #
-#	$Id: PICOBSD,v 1.16 1999/08/22 21:44:46 dwhite dead $
+#	$Id: PICOBSD,v 1.11.2.4 1999/08/22 23:08:59 dwhite dead $
 #
 
-machine		i386
-cpu		I386_CPU
-cpu		I486_CPU
-cpu		I586_CPU
-cpu		I686_CPU
+machine		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
+cpu		"I586_CPU"
+cpu		"I686_CPU"
 ident		PICOBSD
 maxusers	10
 
@@ -17,9 +17,9 @@ 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		"CD9660"		#ISO 9660 Filesystem
 #options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+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
@@ -28,47 +28,53 @@ options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
 options		PCI_QUIET
 #options		DEVFS
+options		NO_LKM
 options		NO_SWAPPING
 # Support for bridging and bandwidth limiting
 #options	DUMMYNET
 #options	BRIDGE
 
+config		kernel	root on fd0a
+
 controller	isa0
 controller	pci0
 
-controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
+controller	fdc0	at isa? port "IO_FD1" bio 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
+#options		"CMD640"	# work around CMD640 chip deficiency
+#controller	wdc0	at isa? port "IO_WD1" bio irq 14
 #disk		wd0	at wdc0 drive 0
 #disk		wd1	at wdc0 drive 1
 
-#controller	wdc1	at isa? port IO_WD2 irq 15
+#controller	wdc1	at isa? port "IO_WD2" bio irq 15
 #disk		wd2	at wdc1 drive 0
 #disk		wd3	at wdc1 drive 1
 
-#device		wcd0	#IDE CD-ROM
+#options		ATAPI		#Enable ATAPI support for IDE bus
+#options		ATAPI_STATIC	#Don't do it as an LKM
+#device		acd0	#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
+controller	atkbdc0	at isa? port IO_KBD tty
+device		atkbd0	at isa? tty irq 1
 
 device		vga0	at isa? port ? conflicts
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
+device		sc0	at isa? tty
 
-device		npx0	at nexus? port IO_NPX irq 13
+device		npx0	at isa? 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		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
+device		sio1	at isa? port "IO_COM2" tty irq 3
+device		sio2	at isa? disable port "IO_COM3" tty irq 5
+device		sio3	at isa? disable port "IO_COM4" tty irq 9
 
-#device ppc0	at isa? port? flags 0x40 irq 7
+#device ppc0	at isa? port? flags 0x40 net irq 7
 #controller	ppbus0
-#device		lpt0	at ppbus?
+#device		nlpt0	at ppbus?
 #device		plip0	at ppbus?
 #device		ppi0	at ppbus?
 
@@ -83,18 +89,18 @@ device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
 # 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
+device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000
+device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000
+device ep0 at isa? port 0x300 net irq 10
+device ep1 at isa? port 0x280 net irq 5
+device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000
+device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000
 
 pseudo-device	loop
 pseudo-device	ether
 #pseudo-device	tun	2
 #pseudo-device	vn
-#pseudo-device bpf	4
+#pseudo-device bpfilter	4
 pseudo-device ppp 	4
 pseudo-device	pty	16
 #pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/router/floppy.tree/etc/rc b/release/picobsd/router/floppy.tree/etc/rc
new file mode 100644
index 000000000000..349cf521e209
--- /dev/null
+++ b/release/picobsd/router/floppy.tree/etc/rc
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $Id: rc.en,v 1.3 1998/11/01 20:19:31 abial Exp $
+### Special setup for one floppy PICOBSD ###
+ifconfig lo0 inet 127.0.0.1 netmask 0xffffff00
+hostname pico
+echo ""
+echo ""
+echo '+----------- PicoBSD @VER@ (ROUTER) ------------+'
+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 '+----------------------------------------------+'
+echo ""
diff --git a/release/picobsd/router/mfs.mtree b/release/picobsd/router/mfs.mtree
index 33798e7d868b..7954fd6ecf7c 100644
--- a/release/picobsd/router/mfs.mtree
+++ b/release/picobsd/router/mfs.mtree
@@ -1,44 +1,86 @@
-#
-# $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
-.              
-    dev            
-    ..
-    etc            
-    ..
-    mnt            
-    ..
-    stand          
-    ..
-    start_floppy   
-    ..
-    tftpboot       
-    ..
-    tmp            
-    ..
-    usr            
-        local          
-            share            
-                snmp           
-		    mibs
-		    ..
-                ..
-            ..
-        ..
-        share          
-            misc           
-            ..
-        ..
-    ..
-    var            
-        db             
-        ..
-        run            
-        ..
-        spool          
-            lock           
-            ..
-        ..
-    ..
-..
+<HTML><HEAD><TITLE>CVS log for src/release/picobsd/router/mfs.tree/Attic/mfs.mtree</TITLE></HEAD>
+<BODY>
+<!-- Generated by cvsweb version 1.0 -->
+<H1 align=center>CVS log for src/release/picobsd/router/mfs.tree/Attic/mfs.mtree</H1>
+Up to <A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/">src/release/picobsd/router/mfs.tree/Attic/</A>
+<BR>
+<A HREF="#diff">Request diff between arbitrary revisions</A>
+<HR>
+<A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?rev=1.1.1.1.2.1"><b>1.1.1.1.2.1</b></A> <i>Sun Aug 22 23:09:14 1999
+</i> by <i>dwhite</i>
+<BR>Branch: <b>RELENG_3</b><BR><A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?r1=1.1.1.1&r2=1.1.1.1.2.1">Diffs to 1.1.1.1</A>
+; <A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?r1=1.2&r2=1.1.1.1.2.1">Diffs to 1.2</A>
+<PRE>
+MFC: PicoBSD mega-upgrade.  It actually works in -STABLE, let's hope I
+didn't miss anything.  According to luigi, I have jkh's OK on this.
+
+Submitted by:  luigi
+</PRE><HR>
+<A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?rev=1.2"><b>1.2</b></A> <i>Sun Aug 22 21:45:16 1999
+</i> by <i>dwhite</i>
+<BR>CVS Tags: <b>HEAD</b><BR><A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?r1=1.1&r2=1.2">Diffs to 1.1</A>
+<PRE>
+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 &amp; 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
+</PRE><HR>
+<A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?rev=1.1.1.1"><b>1.1.1.1</b></A> <i>(vendor branch)</i> <i>Thu Aug 27 17:38:44 1998
+</i> by <i>abial</i>
+<BR>CVS Tags: <b>RELENG_3_2_PAO_BP, RELENG_3_2_0_RELEASE, RELENG_3_1_0_RELEASE, RELENG_3_BP, RELENG_3_0_0_RELEASE, v0_4, RELENG_3_2_PAO</b>; Branch: <b>PICOBSD</b><BR><A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?r1=1.1&r2=1.1.1.1">Diffs to 1.1</A>
+<PRE>
+Initial import of PicoBSD v0.4 tree.
+</PRE><HR>
+<A HREF="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree?rev=1.1"><b>1.1</b></A> <i>Thu Aug 27 17:38:44 1998
+</i> by <i>abial</i>
+<PRE>
+Initial revision
+</PRE><HR>
+<A NAME=diff></A><FORM METHOD="GET" ACTION="/cgi-bin/cvs-bsd/src/release/picobsd/router/mfs.tree/Attic/mfs.mtree">
+<INPUT TYPE=RADIO NAME="f" VALUE=u CHECKED>Uni<INPUT TYPE=RADIO NAME="f" VALUE=c>Context diff
+<INPUT TYPE=SUBMIT VALUE="Get Diffs"><BR>
+<SELECT NAME="r1">
+<OPTION VALUE="text" SELECTED>Use Text Field
+<OPTION VALUE="1.2:HEAD">HEAD
+<OPTION VALUE="1.1.1:PICOBSD">PICOBSD
+<OPTION VALUE="1.1.1.1.2:RELENG_3">RELENG_3
+<OPTION VALUE="1.1.1.1:RELENG_3_0_0_RELEASE">RELENG_3_0_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_1_0_RELEASE">RELENG_3_1_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_2_0_RELEASE">RELENG_3_2_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_2_PAO">RELENG_3_2_PAO
+<OPTION VALUE="1.1.1.1:RELENG_3_2_PAO_BP">RELENG_3_2_PAO_BP
+<OPTION VALUE="1.1.1.1:RELENG_3_BP">RELENG_3_BP
+<OPTION VALUE="1.1.1.1:v0_4">v0_4
+</SELECT>
+<INPUT TYPE="TEXT" NAME="tr1" VALUE="1.1">
+ and 
+<SELECT NAME="r2">
+<OPTION VALUE="text" SELECTED>Use Text Field
+<OPTION VALUE="1.2:HEAD">HEAD
+<OPTION VALUE="1.1.1:PICOBSD">PICOBSD
+<OPTION VALUE="1.1.1.1.2:RELENG_3">RELENG_3
+<OPTION VALUE="1.1.1.1:RELENG_3_0_0_RELEASE">RELENG_3_0_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_1_0_RELEASE">RELENG_3_1_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_2_0_RELEASE">RELENG_3_2_0_RELEASE
+<OPTION VALUE="1.1.1.1:RELENG_3_2_PAO">RELENG_3_2_PAO
+<OPTION VALUE="1.1.1.1:RELENG_3_2_PAO_BP">RELENG_3_2_PAO_BP
+<OPTION VALUE="1.1.1.1:RELENG_3_BP">RELENG_3_BP
+<OPTION VALUE="1.1.1.1:v0_4">v0_4
+</SELECT>
+<INPUT TYPE="TEXT" NAME="tr2" VALUE="1.1.1.1.2.1">
+</FORM>
+<HR><ADDRESS>Created by cvsweb 1.0</ADDRESS><BR>
+
+<ADDRESS>
+  <A HREF="mailto:you@your.address">you@your.address</A>
+</ADDRESS>
+</BODY></HTML>