rpms/nfs-utils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed lockd not using settings in sysconfig/nfs (bz 461043)

Browse Source
This commit is contained in:
Steve Dickson 2009-03-06 12:31:06 +00:00
parent f76c8ecabe
commit 9a95968d9e
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nfs-utils.spec
View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://sourceforge.net/projects/nfs URL: http://sourceforge.net/projects/nfs
Version: 1.1.5 Version: 1.1.5
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -241,6 +241,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4 %attr(4755,root,root) /sbin/umount.nfs4
%changelog %changelog
* Fri Mar 6 2009 Steve Dickson <steved@redhat.com> 1.1.5-2
- Fixed lockd not using settings in sysconfig/nfs (bz 461043)
* Thu Mar 5 2009 Steve Dickson <steved@redhat.com> 1.1.5-1 * Thu Mar 5 2009 Steve Dickson <steved@redhat.com> 1.1.5-1
- Updated to latest upstream version: 1.1.5 - Updated to latest upstream version: 1.1.5

18
nfs.init
View File

@ -55,21 +55,21 @@ case "$1" in
# Start daemons. # Start daemons.
[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd start
# Set the ports lockd should listen on
if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then
[ -x /sbin/modprobe ] && /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
# Load the nfsd module so /proc/fs/nfsd will exist # Load the nfsd module so /proc/fs/nfsd will exist
[ "$NFSD_MODULE" != "noload" ] && { [ "$NFSD_MODULE" != "noload" ] && {
[ -x /sbin/modprobe ] && /sbin/modprobe nfsd [ -x /sbin/modprobe ] && /sbin/modprobe nfsd
} }
action $"Starting NFS services: " /usr/sbin/exportfs -r action $"Starting NFS services: " /usr/sbin/exportfs -r
# Set the ports lockd should listen on
if [ -n "$LOCKD_TCPPORT" ]; then
/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
fi
if [ -n "$LOCKD_UDPPORT" ]; then
/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
fi
if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
echo -n $"Starting NFS quotas: " echo -n $"Starting NFS quotas: "
[ -n "$RQUOTAD_PORT" ] \ [ -n "$RQUOTAD_PORT" ] \

4
nfslock.init
View File

@ -44,11 +44,13 @@ start() {
# See if the kernel lockd should start up # See if the kernel lockd should start up
# listening on a particular port # listening on a particular port
# #
if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then
[ -x /sbin/modprobe ] && /sbin/modprobe lockd $LOCKDARG
[ -n "$LOCKD_TCPPORT" ] && \ [ -n "$LOCKD_TCPPORT" ] && \
/sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1 /sbin/sysctl -w fs.nfs.nlm_tcpport=$LOCKD_TCPPORT >/dev/null 2>&1
[ -n "$LOCKD_UDPPORT" ] && \ [ -n "$LOCKD_UDPPORT" ] && \
/sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
[ -n "$LOCKDARG" ] && modprobe lockd $LOCKDARG fi
echo -n $"Starting NFS statd: " echo -n $"Starting NFS statd: "
# Set statd's local hostname if defined # Set statd's local hostname if defined