Batch of fixes to the configuration files from Bruce Montague

5 files changed, 11 insertions, 12 deletions

diff --git a/release/picobsd/dial/PICOBSD b/release/picobsd/dial/PICOBSD
index 851ddad..6a81815 100644
--- a/release/picobsd/dial/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -22,7 +22,6 @@ options		CD9660			#ISO 9660 Filesystem
 options		EXT2FS
 options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 #options		DEVFS
-options		PCI_QUIET
 options		NO_SWAPPING
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 
diff --git a/release/picobsd/isp/PICOBSD b/release/picobsd/isp/PICOBSD
index 919c365..f2465d5 100644
--- a/release/picobsd/isp/PICOBSD
+++ b/release/picobsd/isp/PICOBSD
@@ -18,8 +18,7 @@ maxusers	20
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
-options		NFS			#Network Filesystem
-options		NFS_NOSERVER		#Network Filesystem
+options		NFSCLIENT		#Network Filesystem
 #options		BOOTP
 options		MD_ROOT			#MFS as root
 options		MSDOSFS			#MSDOS Filesystem
@@ -30,7 +29,6 @@ options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
 #options		DEVFS
-options		PCI_QUIET
 # Support for bridging and bandwidth limiting
 options		DUMMYNET
 options		HZ=1000
@@ -85,7 +83,8 @@ device		ppi
 #
 # The following Ethernet NICs are all PCI devices.
 #
-device de
+device miibus
+device dc
 device fxp
 
 # Order is important here due to intrusive probes, do *not* alphabetize
diff --git a/release/picobsd/isp/crunch.conf b/release/picobsd/isp/crunch.conf
index 807be0b..59e1dac 100644
--- a/release/picobsd/isp/crunch.conf
+++ b/release/picobsd/isp/crunch.conf
@@ -8,6 +8,9 @@
 buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
+# sources for ns & vm & login & maybe other picobsd-specific programs
+srcdirs /usr/src/release/picobsd/tinyware
+# default paths
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
 srcdirs /usr/src/sbin
@@ -15,8 +18,6 @@ srcdirs /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin
 srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
-# sources for ns & vm
-srcdirs /usr/src/release/picobsd/tinyware
 
 progs sh test echo hostname ln login getty
 progs inetd telnetd stty w msg kget natd reboot
diff --git a/release/picobsd/net/PICOBSD b/release/picobsd/net/PICOBSD
index 994a50b..6129174 100644
--- a/release/picobsd/net/PICOBSD
+++ b/release/picobsd/net/PICOBSD
@@ -18,7 +18,7 @@ maxusers	10
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
-options		NFS_NOSERVER		#Network Filesystem
+options		NFSCLIENT		#Network Filesystem
 options		MD_ROOT			#MFS as root
 options		MSDOSFS			#MSDOS Filesystem
 options		CD9660			#ISO 9660 Filesystem
@@ -26,7 +26,6 @@ options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
-options		PCI_QUIET
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 #options		DEVFS
 # Support for bridging and bandwidth limiting
@@ -65,7 +64,8 @@ device		ppi
 #
 # The following Ethernet NICs are all PCI devices.
 #
-device de
+device miibus
+device dc
 device fxp
 
 # Order is important here due to intrusive probes, do *not* alphabetize
diff --git a/release/picobsd/net/crunch.conf b/release/picobsd/net/crunch.conf
index 4323e56..40e6969 100644
--- a/release/picobsd/net/crunch.conf
+++ b/release/picobsd/net/crunch.conf
@@ -7,6 +7,8 @@
 # Default build options.
 buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
+# sources for ns & vm & login and other picobsd-specific programs
+srcdirs /usr/src/release/picobsd/tinyware
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -15,8 +17,6 @@ srcdirs /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin
 srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
-# sources for ns & vm
-srcdirs /usr/src/release/picobsd/tinyware
 
 progs sh test echo hostname ln login getty stty
 progs inetd telnetd w msg kget reboot