d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up some variables that should have been done before:

Browse Source 
xntpd_* -> ntpd_*
portmap_* -> rpcbind_*

Also change single_mountd_enable to mountd_enable.

We also include shims for all the old variable names.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>
This commit is contained in:
Gordon Tetlow 2002-08-14 05:37:15 +00:00
parent c44d84056d
commit 2ee93c5780
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=101850
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/defaults/rc.conf
View File

@ -167,7 +167,7 @@ sshd_enable="NO" # Enable sshd
sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one.
sshd_flags="" # Additional flags for sshd.
### Network daemon (NFS): All need portmap_enable="YES" ###
### Network daemon (NFS): All need rpcbind_enable="YES" ###
amd_enable="NO" # Run amd service with $amd_flags (or NO).
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"
@ -175,16 +175,16 @@ nfs_client_enable="NO" # This host is an NFS client (or NO).
nfs_access_cache="2" # Client cache timeout in seconds
nfs_server_enable="NO" # This host is an NFS server (or NO).
nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled).
single_mountd_enable="NO" # Run mountd only (or NO).
mountd_enable="NO" # Run mountd (or NO).
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 needed for client/server.
rpc_statd_enable="NO" # Run NFS rpc.statd needed for client/server.
portmap_enable="NO" # Run the portmapper service (YES/NO).
portmap_program="/usr/sbin/rpcbind" # path to portmap, if you want a different one.
portmap_flags="" # Flags to portmap (if enabled).
rpcbind_enable="NO" # Run the portmapper service (YES/NO).
rpcbind_program="/usr/sbin/rpcbind" # path to rpcbind, if you want a different one.
rpcbind_flags="" # Flags to rpcbind (if enabled).
rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO).
keyserv_enable="NO" # Run the SecureRPC keyserver (or NO).
keyserv_flags="" # Flags to keyserv (if enabled).
@ -195,11 +195,11 @@ timed_flags="" # Flags to timed (if enabled).
ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO).
ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one.
ntpdate_flags="-b" # Flags to ntpdate (if enabled).
xntpd_enable="NO" # Run ntpd Network Time Protocol (or NO).
xntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.
xntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled).
ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO).
ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one.
ntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled).
# Network Information Services (NIS) options: All need portmap_enable="YES" ###
# Network Information Services (NIS) options: All need rpcbind_enable="YES" ###
nis_client_enable="NO" # We're an NIS client (or NO).
nis_client_flags="" # Flags to ypbind (if enabled).
nis_ypset_enable="NO" # Run ypset at boot time (or NO).

20
etc/rc
View File

@ -122,6 +122,17 @@ elif [ -r /etc/rc.conf ]; then
. /etc/rc.conf
fi
# XXX - Deprecated variable name support
# for rpcbind and ntpd
#
[ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable"
[ -n "$portmap_program" ] && rpcbind_program="$portmap_program"
[ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags"
[ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable"
[ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable"
[ -n "$xntpd_program" ] && ntpd_program="$xntpd_program"
[ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags"
feed_dev_random() {
if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
# echo "Using ${1} as an entropy file"
@ -153,11 +164,12 @@ chkdepend() {
esac
}
chkdepend amd amd_enable portmap portmap_enable
chkdepend amd amd_enable rpcbind rpcbind_enable
chkdepend amd amd_enable NFS nfs_client_enable
chkdepend NFS nfs_server_enable portmap portmap_enable
chkdepend NIS nis_server_enable portmap portmap_enable
chkdepend NIS nis_client_enable portmap portmap_enable
chkdepend NFS nfs_server_enable rpcbind rpcbind_enable
chkdepend NFS nfs_server_enable rpcbind rpcbind_enable
chkdepend NIS nis_server_enable rpcbind rpcbind_enable
chkdepend NIS nis_client_enable rpcbind rpcbind_enable
# Enable dumpdev early so that a crash during the boot process can be caught.
#

16
etc/rc.subr
View File

@ -814,8 +814,22 @@ load_rc_config()
debug "Sourcing /etc/rc.conf.d/${_command}"
. /etc/rc.conf.d/"$_command"
fi
}
# XXX - Deprecated variable name support
#
case `${CMD_OSTYPE}` in
FreeBSD)
[ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable"
[ -n "$portmap_program" ] && rpcbind_program="$portmap_program"
[ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags"
[ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable"
[ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable"
[ -n "$xntpd_program" ] && ntpd_program="$xntpd_program"
[ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags"
;;
esac
}
#
# rc_usage commands