Clean up the scripts to use the new variables:

xntpd_* -> ntpd_*
portmap_* -> rpcbind_*

Also change single_mountd_enable -> mountd_enable
Changing the mountd flags brings us closer to NetBSD.

All of the old variable names are shimmed so you can continue to use the
old variable name.

Finally make /etc/rc.d/mountd no longer dependent on nfs as there are
(apparently) other consumers of mountd.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/etc/rc.network b/etc/rc.network
index febaf839a3e7..95f92a4607bb 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -561,9 +561,9 @@ network_pass2() {
 		;;
 	esac
 
-	case ${xntpd_enable} in
+	case ${ntpd_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' ntpd';	${xntpd_program:-ntpd} ${xntpd_flags}
+		echo -n ' ntpd';	${ntpd_program:-ntpd} ${ntpd_flags}
 		;;
 	esac
 
@@ -573,10 +573,10 @@ network_pass2() {
 		;;
 	esac
 
-	case ${portmap_enable} in
+	case ${rpcbind_enable} in
 	[Yy][Ee][Ss])
-		echo -n ' rpcbind';	${portmap_program:-/usr/sbin/rpcbind} \
-			${portmap_flags}
+		echo -n ' rpcbind';	${rpcbind_program:-/usr/sbin/rpcbind} \
+			${rpcbind_flags}
 
 		# Start ypserv if we're an NIS server.
 		# Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server.
@@ -645,7 +645,7 @@ network_pass2() {
 network_pass3() {
 	echo -n 'Starting final network daemons:'
 
-	case ${portmap_enable} in
+	case ${rpcbind_enable} in
 	[Yy][Ee][Ss])
 		case ${nfs_server_enable} in
 		[Yy][Ee][Ss])