convert some nfs tunables to options, these are:

NFS_MINATTRTIMO         VREG attrib cache timeout in sec
NFS_MAXATTRTIMO
NFS_MINDIRATTRTIMO      VDIR attrib cache timeout in sec
NFS_MAXDIRATTRTIMO
NFS_GATHERDELAY         Default write gather delay (msec)
NFS_UIDHASHSIZ          Tune the size of nfssvc_sock with this
NFS_WDELAYHASHSIZ       and with this
NFS_MUIDHASHSIZ         Tune the size of nfsmount with this
NFS_NOSERVER            (already documented in LINT)
NFS_DEBUG               turn on NFS debugging

also, because NFS_ROOT is used by very different files, it has been
renamed to opt_nfsroot.h instead of the old opt_nfs.h....

4 files changed, 30 insertions, 6 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 3eec979..5faea2f 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.438 1998/06/21 13:36:53 bde Exp $
+#	$Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -533,6 +533,18 @@ options		SUIDDIR
 # in the NULL filesystem
 #options		SAFETY
 
+
+# NFS options:
+options		"NFS_MINATTRTIMO=3"	# VREG attrib cache timeout in sec
+options		"NFS_MAXATTRTIMO=60"
+options		"NFS_MINDIRATTRTIMO=30"	# VDIR attrib cache timeout in sec
+options		"NFS_MAXDIRATTRTIMO=60"
+options		"NFS_GATHERDELAY=10"	# Default write gather delay (msec)
+options		"NFS_UIDHASHSIZ=29"	# Tune the size of nfssvc_sock with this
+options		"NFS_WDELAYHASHSIZ=16"	# and with this
+options		"NFS_MUIDHASHSIZ=63"	# Tune the size of nfsmount with this
+options		NFS_DEBUG		# Enable NFS Debugging
+
 
 #####################################################################
 # POSIX P1003.1B
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3eec979..5faea2f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.438 1998/06/21 13:36:53 bde Exp $
+#	$Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -533,6 +533,18 @@ options		SUIDDIR
 # in the NULL filesystem
 #options		SAFETY
 
+
+# NFS options:
+options		"NFS_MINATTRTIMO=3"	# VREG attrib cache timeout in sec
+options		"NFS_MAXATTRTIMO=60"
+options		"NFS_MINDIRATTRTIMO=30"	# VDIR attrib cache timeout in sec
+options		"NFS_MAXDIRATTRTIMO=60"
+options		"NFS_GATHERDELAY=10"	# Default write gather delay (msec)
+options		"NFS_UIDHASHSIZ=29"	# Tune the size of nfssvc_sock with this
+options		"NFS_WDELAYHASHSIZ=16"	# and with this
+options		"NFS_MUIDHASHSIZ=63"	# Tune the size of nfsmount with this
+options		NFS_DEBUG		# Enable NFS Debugging
+
 
 #####################################################################
 # POSIX P1003.1B
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index f7c0960..487d39d 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.97 1998/05/12 17:33:58 bde Exp $
+ *	$Id: autoconf.c,v 1.98 1998/06/09 12:52:31 bde Exp $
  */
 
 /*
@@ -50,7 +50,7 @@
 #include "opt_ffs.h"
 #include "opt_cd9660.h"
 #include "opt_mfs.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 91e2fa1..ff28a23 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
+ *	$Id: locore.s,v 1.109 1998/06/21 18:02:34 bde Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -46,7 +46,7 @@
 #include "apm.h"
 #include "opt_bootp.h"
 #include "opt_ddb.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
 #include "opt_userconfig.h"
 #include "opt_vm86.h"