===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- src/etc/rc.conf	2011/07/07 23:31:09	1.148
+++ src/etc/rc.conf	2011/07/08 00:54:04	1.149
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.148 2011/07/07 23:31:09 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.149 2011/07/08 00:54:04 ajacoutot Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -76,8 +76,6 @@
 wsmoused_flags=NO	# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
 
 # set the following to "YES" to turn them on
-nfs_server=NO		# see sysctl.conf for nfs client configuration
-lockd=NO
 amd=NO
 pf=YES			# Packet filter / NAT
 ipsec=NO		# IPsec
@@ -98,7 +96,10 @@
 savecore_flags=			# "-z" to compress
 ypserv_flags=NO			# add more flags, eg. -1 for YP v1, -d for DNS etc
 yppasswdd_flags=NO		# "-d /etc/yp" if passwd files are in /etc/yp
-nfsd_flags="-tun 4"		# Crank the 4 for a busy NFS fileserver
+nfsd_flags=NO			# for normal use: "-tun 4" and see nfsd(8)
+mountd_flags=NO			# for normal use: ""
+lockd_flags=NO			# for normal use: ""
+statd_flags=NO			# for normal use: ""
 amd_master=/etc/amd/master	# AMD 'master' map
 syslogd_flags=			# add more flags, e.g. "-u -a /chroot/dev/log"
 pf_rules=/etc/pf.conf		# Packet filter rules file
@@ -115,7 +116,9 @@
 
 local_rcconf="/etc/rc.conf.local"
 
-unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags kpasswdd_flags btd_flags
+unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
+unset kpasswdd_flags btd_flags nfsd_flags mountd_flags lockd_flags
+unset statd_flags
 
 [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
 
@@ -127,3 +130,7 @@
 : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
 : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
 : ${btd_flags=$([ X"${bt-NO}" = XYES ] || echo NO)}
+: ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
+: ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
+: ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
+: ${statd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}