diff --git a/lockd.conf b/lockd.conf index a77d72a..f672d12 100644 --- a/lockd.conf +++ b/lockd.conf @@ -1,7 +1,23 @@ # -# To be installed in /etc/modprobe.d +# Set the NFS lock manager grace period. n is measured in seconds. +#options lockd nlm_grace_period=90 # -# Those who have need for lockd to listen on a particular port should -# uncomment the line below and set the values appropriately. +# Set the TCP port that the NFS lock manager should use. +# port must be a valid TCP port value (1-65535). +#options lockd nlm_tcpport # -#options lockd nlm_tcpport=32803 nlm_udpport=32769 +# Set the UDP port that the NFS lock manager should use. +# port must be a valid UDP port value (1-65535). +#options lockd nlm_udpport +# +# Set the maximum number of outstanding connections +#options lockd nlm_max_connections=1024 +# +# Set the default time value for the NFS lock manager +# in seconds. Default is 10 secs (min 3 max 20) +#options lockd nlm_timeout=10 +# +# Choose whether to record the caller_name or IP address +# this peer in the local rpc.statd's database. +#options lockd nsm_use_hostnames=0 + diff --git a/nfs-utils_env.sh b/nfs-utils_env.sh index a08d69d..56f01eb 100644 --- a/nfs-utils_env.sh +++ b/nfs-utils_env.sh @@ -11,15 +11,6 @@ if test -r $nfs_config; then . $nfs_config fi -[ -n "$LOCKDARG" ] && /sbin/modprobe lockd $LOCKDARG -if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then - [ -z "$LOCKDARG" ] && /sbin/modprobe lockd $LOCKDARG - [ -n "$LOCKD_TCPPORT" ] && \ - /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 - [ -n "$LOCKD_UDPPORT" ] && \ - /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 -fi - if [ -n "$NFSD_V4_GRACE" ]; then grace="-G $NFSD_V4_GRACE" fi diff --git a/nfs.sysconfig b/nfs.sysconfig index e777b94..04b9867 100644 --- a/nfs.sysconfig +++ b/nfs.sysconfig @@ -1,10 +1,9 @@ + +# +# +# To set lockd kernel module parameters please see +# /etc/modprobe.d/lockd.conf # -# Optional arguments passed to in-kernel lockd -#LOCKDARG= -# TCP port rpc.lockd should listen on. -#LOCKD_TCPPORT=32803 -# UDP port rpc.lockd should listen on. -#LOCKD_UDPPORT=32769 # # Optional arguments passed to rpc.nfsd. See rpc.nfsd(8) RPCNFSDARGS=""