diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-05-19 16:53:19 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-05-19 16:53:19 +0000 |
| commit | 9c688763b34bddd4288bbf3a40a83abfb2ad3c9d (patch) | |
| tree | cb64b36766578692f9a229cb270a6fd208c9289b | |
| parent | dd214587976008b55e20af1332756fd4c218c6d3 (diff) | |
nfsiod/nfs_client, bye bye
add commented out entry into sysctl.conf for vfs.nfs.iothreads
| -rw-r--r-- | etc/rc | 8 | ||||
| -rw-r--r-- | etc/rc.conf | 4 | ||||
| -rw-r--r-- | etc/sysctl.conf | 3 |
3 files changed, 4 insertions, 11 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.138 2000/05/15 18:24:42 hin Exp $ +# $OpenBSD: rc,v 1.139 2000/05/19 16:53:17 mickey Exp $ # System startup script run by init on autoboot # or after single-user. @@ -262,12 +262,6 @@ if [ X${nfs_server} = X"YES" -a -s /etc/exports -a \ fi fi -# $nfs_client is imported from /etc/rc.conf; -# if $nfs_client == YES, the machine is setup for being an nfs client -if [ X${nfs_client} = X"YES" ]; then - echo -n ' nfsiod'; nfsiod ${nfsiod_flags} -fi - if [ X${amd} = X"YES" -a -d ${amd_dir} -a -e ${amd_master} ]; then echo -n ' amd' (cd /etc/amd; amd -l syslog -x error,noinfo,nostats -p \ diff --git a/etc/rc.conf b/etc/rc.conf index 9bad1c7e7e9..634363ee31b 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.46 2000/04/30 23:17:05 ericj Exp $ +# $OpenBSD: rc.conf,v 1.47 2000/05/19 16:53:18 mickey Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -40,7 +40,6 @@ xdm_flags=NO # for normal use: "" # set the following to "YES" to turn them on rwhod=NO nfs_server=NO -nfs_client=NO lockd=NO gated=NO kerberos_server=NO # kerberos server. run 'info kth-krb' for assistance. @@ -67,7 +66,6 @@ gated_flags= ypserv_flags= # E.g. -1 for YP v1, -d for DNS etc yppasswdd_flags= # "-d /etc/yp" if passwd files are in /etc/yp nfsd_flags="-tun 4" # Crank the 4 for a busy NFS fileserver -nfsiod_flags="-n 4" # Crank the 4 for a busy NFS client amd_dir=/tmp_mnt # AMD's mount directory amd_master=/etc/amd/master # AMD 'master' map ipfilter_rules=/etc/ipf.rules # Rules for IP packet filtering diff --git a/etc/sysctl.conf b/etc/sysctl.conf index 51f9fc84cef..1335f471e80 100644 --- a/etc/sysctl.conf +++ b/etc/sysctl.conf @@ -1,4 +1,4 @@ -# $OpenBSD: sysctl.conf,v 1.16 2000/03/30 06:42:17 angelos Exp $ +# $OpenBSD: sysctl.conf,v 1.17 2000/05/19 16:53:18 mickey Exp $ # This files contains a list of sysctl options the user wants set at # boot time. # ie. @@ -13,3 +13,4 @@ #fs.posix.setuid=0 # 0=Traditional BSD chown() semantics #vm.swapencrypt=1 # 1=Encrypt pages that go to swap #net.inet.ip.ipsec-acl=0 # 0=disable IPsec ingress ACL checking +#vfs.nfs.iothreads=4 # number of nfsio kernel threads |