Index: head/etc/rc.d/lockd
===================================================================
--- head/etc/rc.d/lockd	(revision 179940)
+++ head/etc/rc.d/lockd	(revision 179941)
@@ -1,43 +1,43 @@
 #!/bin/sh
 #
 # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
 # $FreeBSD$
 #
 
 # PROVIDE: lockd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind statd
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="lockd"
 rcvar=rpc_lockd_enable
 command="/usr/sbin/rpc.${name}"
 start_precmd='lockd_precmd'
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable'
 status_precmd=$stop_precmd
 
 # Make sure that we are either an NFS client or server, and that we get
 # the correct flags from rc.conf(5).
 #
 lockd_precmd()
 {
 	local ret
 	ret=0
 
-	if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
+	if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable
 	then
 		ret=1
 	fi
 	if ! checkyesno rpcbind_enable && \
 	    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
 	then
 		force_depend rpcbind || ret=1
 	fi
 	rc_flags=${rpc_lockd_flags}
 	return ${ret}
 }
 
 load_rc_config $name
 run_rc_command $1
Index: head/etc/rc.d/statd
===================================================================
--- head/etc/rc.d/statd	(revision 179940)
+++ head/etc/rc.d/statd	(revision 179941)
@@ -1,43 +1,43 @@
 #!/bin/sh
 #
 # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
 # $FreeBSD$
 #
 
 # PROVIDE: statd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
 name="statd"
 rcvar=rpc_statd_enable
 command="/usr/sbin/rpc.${name}"
 start_precmd='statd_precmd'
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable'
 status_precmd=$stop_precmd
 
 # Make sure that we are either an NFS client or server, and that we get
 # the correct flags from rc.conf(5).
 #
 statd_precmd()
 {
 	local ret
 	ret=0
 
-	if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
+	if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable
 	then
 		ret=1
 	fi
 	if ! checkyesno rpcbind_enable && \
 	    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
 	then
 		force_depend rpcbind || ret=1
 	fi
 	rc_flags=${rpc_statd_flags}
 	return ${ret}
 }
 
 load_rc_config $name
 run_rc_command $1