Kill the remnants of DEVFS, since it's broken without the SLICE code...

Pity - it was _very_ handy.

This also required increasing of MFS size, so that PicoBSD consumes more
memory now...

7 files changed, 30 insertions, 26 deletions

diff --git a/release/picobsd/build/build b/release/picobsd/build/build
index fb5970c..8036b74 100755
--- a/release/picobsd/build/build
+++ b/release/picobsd/build/build
@@ -1,7 +1,7 @@
 #!/bin/sh -
 
 #
-#	$Id: build,v 1.5 1998/09/07 06:46:25 abial Exp $
+#	$Id: build,v 1.6 1998/09/15 11:12:13 abial Exp $
 #
 
 # You can set the SRC variable which points to your source tree. It's
@@ -20,9 +20,9 @@ ROUTER_DFLT_SIZE=820
 NET_DFLT_SIZE=2200
 ISP_DFLT_SIZE=2200
 
-# SET THIS if you're building on 2.2.x system
+# SET THIS if you're not using DEVFS
 #
-# RELENG_2_2=yes
+# NO_DEVFS=yes
 
 # Path to srcdirs of special program for init(8) (standard if empty)
 INIT=
@@ -89,7 +89,7 @@ sleep 2
 # Build the kernel, if necessary
 build_kernel
 
-export SIZE LANGUAGE TYPE SRC RELENG_2_2 INIT
+export SIZE LANGUAGE TYPE SRC NO_DEVFS INIT
 
 for i in stage1 populate stage2 stage3
 do
@@ -295,7 +295,7 @@ then
 			set_dflt_size
 			echo "---------------------------------------------">>build.status
 			echo "Building TYPE=${z}, LANGUAGE=${y}, SIZE=${SIZE}" >>build.status
-			export TYPE SIZE LANGUAGE SRC RELENG_2_2 INIT
+			export TYPE SIZE LANGUAGE SRC NO_DEVFS INIT
 			main
 			if [ "X$?" != "X0" ]
 			then
@@ -360,7 +360,7 @@ do
 	esac
 done
 # Export the parameters
-export LANGUAGE SIZE TYPE SRC RELENG_2_2 INIT
+export LANGUAGE SIZE TYPE SRC NO_DEVFS INIT
 # Call the build procedure
 main
 # Install if it's ok.
diff --git a/release/picobsd/build/clean b/release/picobsd/build/clean
index 6c17082..e9b9724 100755
--- a/release/picobsd/build/clean
+++ b/release/picobsd/build/clean
@@ -1,7 +1,7 @@
 #! /bin/sh -
 
 #
-#	$Id: clean,v 1.3 1998/09/04 19:38:57 abial Exp $
+#	$Id: clean,v 1.4 1998/09/07 19:00:14 abial Exp $
 #
 set -e
 
@@ -28,7 +28,11 @@ do
 	echo "===================== $0 $j started ======================"
 	for i in `ls -d tinyware/[a-z]*` tools/write_mfs_in_kernel tools/dumpnlist ${j}/crunch1
 	do
-		(cd ${i} && make clean && make cleandepend)
+		(cd ${i}; \
+		if [ -f Makefile ]; \
+		then \
+			 make clean && make cleandepend;\
+		fi)
 	done
 
 	echo "=============== $0 $j completed successfuly =============="
diff --git a/release/picobsd/build/populate b/release/picobsd/build/populate
index 3d73a84..066ab33 100755
--- a/release/picobsd/build/populate
+++ b/release/picobsd/build/populate
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: populate,v 1.3 1998/09/04 08:08:05 abial Exp $
+#	$Id: populate,v 1.4 1998/09/07 19:00:15 abial Exp $
 #
 
 pwd=`pwd`
@@ -8,7 +8,7 @@ pwd=`pwd`
 echo "-> Populating MFS tree..."
 cd ../${TYPE}/mfs.tree
 make
-if [ X"${RELENG_2_2}" != X"" ]
+if [ X"${NO_DEVFS}" != X"" ]
 then
 	make devnodes
 fi
diff --git a/release/picobsd/dial/conf/PICOBSD b/release/picobsd/dial/conf/PICOBSD
index 2c07ad5..5886e30 100644
--- a/release/picobsd/dial/conf/PICOBSD
+++ b/release/picobsd/dial/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.4 1998/08/02 12:19:29 abial Exp $
+# $Id: PICOBSD,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 machine		"i386"
 cpu		"I386_CPU"
@@ -20,10 +20,10 @@ options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
 options		USERCONFIG_BOOT		#imply -c and parse info area
-options		DEVFS
-options		SLICE
+#options		DEVFS
 options		PCI_QUIET
 options		NO_SWAPPING
+options		NO_LKM
 
 config		kernel	root on fd0
 
@@ -82,4 +82,4 @@ pseudo-device	loop
 pseudo-device	ether
 pseudo-device	tun	1
 pseudo-device	pty	16
-pseudo-device	gzip		# Exec gzipped a.out's
+#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD
index 0e51c0c..3114bb8 100644
--- a/release/picobsd/isp/conf/PICOBSD
+++ b/release/picobsd/isp/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: PICOBSD,v 1.2 1998/09/02 14:15:54 abial Exp $
 #
 
 machine		"i386"
@@ -26,9 +26,9 @@ options		VISUAL_USERCONFIG	#visual boot -c editor
 options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
-options		DEVFS
-options		SLICE
+#options		DEVFS
 options		PCI_QUIET
+options		NO_LKM
 # Support for bridging and bandwidth limiting
 #options	DUMMYNET
 #options	BRIDGE
@@ -128,4 +128,4 @@ pseudo-device	ppp	8
 pseudo-device	tun	2
 #pseudo-device	vn
 pseudo-device	pty	16
-pseudo-device	gzip		# Exec gzipped a.out's
+#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/net/conf/PICOBSD b/release/picobsd/net/conf/PICOBSD
index c79fddc..24ebe4e 100644
--- a/release/picobsd/net/conf/PICOBSD
+++ b/release/picobsd/net/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-#	$Id: PICOBSD,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+#	$Id: PICOBSD,v 1.2 1998/09/02 14:16:03 abial Exp $
 #
 
 machine		"i386"
@@ -26,8 +26,8 @@ options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
 options		PCI_QUIET
-options		DEVFS
-options		SLICE
+options		NO_LKM
+#options		DEVFS
 # Support for bridging and bandwidth limiting
 #options	DUMMYNET
 #options	BRIDGE
@@ -94,4 +94,4 @@ pseudo-device	ether
 pseudo-device	tun	2
 #pseudo-device	vn
 pseudo-device	pty	16
-pseudo-device	gzip		# Exec gzipped a.out's
+#pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD
index d6f549c..d7d667c 100644
--- a/release/picobsd/router/conf/PICOBSD
+++ b/release/picobsd/router/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-#	$Id: PICOBSD,v 1.2 1998/08/31 13:21:45 abial Exp $
+#	$Id: PICOBSD,v 1.3 1998/09/02 14:16:07 abial Exp $
 #
 
 machine		"i386"
@@ -26,8 +26,8 @@ options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
 options		PCI_QUIET
-options		DEVFS
-options		SLICE
+#options		DEVFS
+options		NO_LKM
 options		NO_SWAPPING
 # Support for bridging and bandwidth limiting
 #options	DUMMYNET
@@ -95,4 +95,4 @@ pseudo-device	ether
 #pseudo-device bpfilter	4
 pseudo-device ppp 	4
 pseudo-device	pty	16
-pseudo-device	gzip		# Exec gzipped a.out's
+#pseudo-device	gzip		# Exec gzipped a.out's