summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-08-19 21:55:16 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-08-19 21:55:16 +0000
commit081f25d36cd5bbc731e9a3f493deb4ffc5e25f93 (patch)
tree66dc6186ee90164bd2eef8e573568e3202aef4b7
parent5a82b9b65d5f70934fc30e37d133d8aad0b4b4b6 (diff)
Add hook for rpc.lockd, make nfsd flags settable in netstart
-rw-r--r--etc/netstart4
-rw-r--r--etc/rc7
2 files changed, 8 insertions, 3 deletions
diff --git a/etc/netstart b/etc/netstart
index fb08c712f74..1230b6b4368 100644
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: netstart,v 1.26 1997/07/31 02:23:46 downsj Exp $
+# $OpenBSD: netstart,v 1.27 1997/08/19 21:55:15 niklas Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags=-q
@@ -17,6 +17,7 @@ photurisd_flags="" # for 'normal' use: photurisd_flags=""
rwhod=NO
nfs_server=NO
nfs_client=NO
+lockd=NO
gated=NO
kerberos_server=NO
amd=NO
@@ -32,6 +33,7 @@ check_quotas=YES # NO may be desireable in some YP environments
gated_flags=
ypserv_flags= # E.g. -1 for YP v1, -d for DNS etc
yppasswdd_flags= # "-d /etc/yp" if passwd files is in /etc/yp
+nfsd_flags="-tun 4" # Crank the 4 for a busy fileserver
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/rc b/etc/rc
index d101224391c..1bc2a34977d 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.41 1997/07/31 02:23:45 downsj Exp $
+# $OpenBSD: rc,v 1.42 1997/08/19 21:55:14 niklas Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -156,7 +156,10 @@ if [ X${nfs_server} = X"YES" -a -r /etc/exports ]; then
rm -f /var/db/mountdtab
echo -n > /var/db/mountdtab
echo -n ' mountd'; mountd
- echo -n ' nfsd'; nfsd -tun 4
+ echo -n ' nfsd'; nfsd ${nfsd_flags}
+ if [ X${lockd} = X"YES" ]; then
+ echo -n ' rpc.lockd'; rpc.lockd
+ fi
fi
# $nfs_client is imported from /etc/netstart;