Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Oct 2001 13:21:38 -0700 (PDT)
From:      Gordon Tetlow <gordont@gnf.org>
To:        <freebsd-gnats-submit@FreeBSD.org>
Cc:        <hackers@FreeBSD.org>
Subject:   Re: bin/30972: nfsd and mountd are in the wrong location
Message-ID:  <Pine.LNX.4.33.0110101303380.807-100000@smtp.gnf.org>

next in thread | raw e-mail | index | archive | help
Here is a diff that fixes a couple of issues and will facilitate moving
nfsd and mountd into /usr/sbin

This also removes the bogus nfs_client_flags since it is no longer used.

This needs to happen to make migrating to the rc.d system easier.

-gordon

diff -ur /usr/src/etc/defaults/rc.conf etc.nfsd/defaults/rc.conf
--- /usr/src/etc/defaults/rc.conf	Wed Oct 10 09:36:28 2001
+++ etc.nfsd/defaults/rc.conf	Wed Oct 10 09:43:11 2001
@@ -159,15 +159,16 @@
 amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
 amd_map_program="NO"		# Can be set to "ypcat -k amd.master"
 nfs_client_enable="NO"		# This host is an NFS client (or NO).
-nfs_client_flags="-n 4"		# Flags to nfsiod (if enabled).
 nfs_access_cache="2"		# Client cache timeout in seconds
+nfs_bufpackets="DEFAULT"	# bufspace (in packets) for client (or DEFAULT)
 nfs_server_enable="NO"		# This host is an NFS server (or NO).
+nfs_server_program="/usr/sbin/nfsd"	# path to nfsd
 nfs_server_flags="-u -t -n 4"	# Flags to nfsd (if enabled).
 single_mountd_enable="NO"       # Run mountd only (or NO).
+mountd_program="/usr/sbin/mountd"	# path to mountd
 mountd_flags="-r"		# Flags to mountd (if NFS server enabled).
 weak_mountd_authentication="NO"	# Allow non-root mount requests to be served.
 nfs_reserved_port_only="NO"	# Provide NFS only on secure port (or NO).
-nfs_bufpackets="DEFAULT"	# bufspace (in packets) for client (or DEFAULT)
 rpc_lockd_enable="NO"		# Run NFS rpc.lockd (*broken!*) if nfs_server.
 rpc_statd_enable="NO"		# Run NFS rpc.statd if nfs_server (or NO).
 portmap_enable="NO"		# Run the portmapper service (YES/NO).
diff -ur /usr/src/etc/rc.network etc.nfsd/rc.network
--- /usr/src/etc/rc.network	Fri Sep 21 10:53:51 2001
+++ etc.nfsd/rc.network	Wed Oct 10 10:29:47 2001
@@ -614,7 +614,7 @@
 					;;
 				esac

-				mountd ${mountd_flags}
+				${mountd_program} ${mountd_flags}

 				case ${nfs_reserved_port_only} in
 				[Yy][Ee][Ss])
@@ -623,7 +623,8 @@
 					;;
 				esac

-				echo -n ' nfsd';	nfsd ${nfs_server_flags}
+				echo -n ' nfsd';
+				${nfsd_server_program} ${nfs_server_flags}

 				case ${rpc_lockd_enable} in
 				[Yy][Ee][Ss])
@@ -659,7 +660,6 @@

 		case ${nfs_client_enable} in
 		[Yy][Ee][Ss])
-			#echo -n ' nfsiod';	nfsiod ${nfs_client_flags}
 			if [ -n "${nfs_access_cache}" ]; then
 				echo -n " NFS access cache time=${nfs_access_cache}"
 				sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.33.0110101303380.807-100000>