rpms/nfs-utils/devel nfs-utils.spec, 1.170, 1.171 nfs.sysconfig, 1.3, 1.4 nfslock.init, 1.20, 1.21
Steve Dickson (steved)
fedora-extras-commits at redhat.com
Fri Apr 25 15:40:25 UTC 2008
- Previous message (by thread): rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.6.4-noversion.patch, NONE, 1.1 NetworkManager-pptp-0.6.4-pppdplugin.patch, NONE, 1.1 NetworkManager-pptp-0.6.6-desktop.patch, NONE, 1.1 NetworkManager-pptp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/epel-release/EL-4 epel-release.spec, 1.2, 1.3 epel-testing.repo, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11697
Modified Files:
nfs-utils.spec nfs.sysconfig nfslock.init
Log Message:
Corrected the nfslock initscript 'status' return code (bz 441605)
Removed obsolete code from the nfslock initscript (bz 441604)
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- nfs-utils.spec 23 Apr 2008 19:07:42 -0000 1.170
+++ nfs-utils.spec 25 Apr 2008 15:39:48 -0000 1.171
@@ -257,9 +257,11 @@
%attr(4755,root,root) /sbin/umount.nfs4
%changelog
-* Wed Apr 23 2008 Steve Dickson <steved at redhat.com> 1.1.2-3
+* Fri Apr 25 2008 Steve Dickson <steved at redhat.com> 1.1.2-3
- Documented how to turn off/on protocol support for
rpc.nfsd in /etc/sysconfig/nfs (bz443625)
+- Corrected the nfslock initscript 'status' return code (bz 441605)
+- Removed obsolete code from the nfslock initscript (bz 441604)
* Mon Apr 14 2008 Steve Dickson <steved at redhat.com> 1.1.2-2
- Make EACCES a non fatal error (bz 439807)
Index: nfs.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nfs.sysconfig 23 Apr 2008 18:56:36 -0000 1.3
+++ nfs.sysconfig 25 Apr 2008 15:39:48 -0000 1.4
@@ -15,6 +15,8 @@
#RPCRQUOTADOPTS=""
#
#
+# 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.
Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nfslock.init 3 Mar 2008 16:22:08 -0000 1.20
+++ nfslock.init 25 Apr 2008 15:39:48 -0000 1.21
@@ -18,6 +18,8 @@
fi
# Check for and source configuration file
+LOCKDARG=""
+STATDARG=""
[ -f /etc/sysconfig/nfs ] && . /etc/sysconfig/nfs
. /etc/sysconfig/network
@@ -25,31 +27,9 @@
# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 6
-# Start lockd from userland only if kernel <= 2.2.18
-OS_RELEASE=`uname --release`
-OS_RELEASE_MAJOR=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\..*/\1/'`
-OS_RELEASE_MINOR=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\)\..*/\2/'`
-OS_RELEASE_VERSION=`echo "$OS_RELEASE" | sed 's/\(^[0-9]\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
-
-if [ "$OS_RELEASE_MAJOR" -le 2 -a "$OS_RELEASE_MINOR" -le 2 -a "$OS_RELEASE_VERSION" -le 18 ] ; then
- USERLAND_LOCKD="yes"
-else
- USERLAND_LOCKD=
-fi
-
-if [ "$USERLAND_LOCKD" ] ; then
- [ -x /sbin/rpc.lockd ] || exit 5
-fi
-
[ -x /sbin/rpc.statd ] || exit 5
RETVAL=0
-if [ -n "${STATD_HOSTNAME}" ]; then
- STATDARG="-n ${STATD_HOSTNAME}"
-else
- STATDARG=""
-fi
-
start() {
if [ ! -f /var/lock/subsys/nfslock ]; then
@@ -58,26 +38,24 @@
rm -f /var/run/sm-notify.pid
# Start daemons.
- if [ "$USERLAND_LOCKD" ]; then
- echo -n $"Starting NFS locking: "
- daemon rpc.lockd
- echo
- else
# See if the kernel lockd should start up
# listening on a particular port
#
- LOCKDARG=""
- [ -n "$LOCKD_TCPPORT" ] && LOCKDARG="nlm_tcpport=$LOCKD_TCPPORT"
- [ -n "$LOCKD_UDPPORT" ] && \
- LOCKDARG="$LOCKDARG nlm_udpport=$LOCKD_UDPPORT"
- [ -n "$LOCKDARG" ] && \
- modprobe lockd $LOCKDARG
- fi
+ [ -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
+ [ -n "$LOCKDARG" ] && modprobe lockd $LOCKDARG
+
echo -n $"Starting NFS statd: "
+ # Set statd's local hostname if defined
+ [ -n "${STATD_HOSTNAME}" ] && STATDARG="$STATDARG -n ${STATD_HOSTNAME}"
+
# See if a statd's ports has been defined
[ -n "$STATD_PORT" ] && STATDARG="$STATDARG -p $STATD_PORT"
[ -n "$STATD_OUTGOING_PORT" ] \
&& STATDARG="$STATDARG -o $STATD_OUTGOING_PORT"
+
# See if we have an HA-callout program specified
[ -n "$STATD_HA_CALLOUT" ] \
&& STATDARG="$STATDARG -H $STATD_HA_CALLOUT"
@@ -115,26 +93,19 @@
stop
;;
status)
- if [ "$USERLAND_LOCKD" ]; then
- status lockd
- fi
status rpc.statd
+ RETVAL=$?
;;
restart)
- stop
+ stop
start
;;
probe)
if [ ! -f /var/lock/subsys/nfslock ] ; then
echo $"start"; exit 0
fi
- /sbin/pidof rpc.statd >/dev/null 2>&1; STATD="$?"
- if [ "$USERLAND_LOCKD" ]; then
- /sbin/pidof lockd >/dev/null 2>&1; LOCKD="$?"
- else
- LOCKD=0
- fi
- if [ $STATD = 1 -o $LOCKD = 1 ] ; then
+ /sbin/pidof rpc.statd >/dev/null 2>&1
+ if [ $? = 1 ] ; then
echo $"restart"; exit 0
fi
;;
- Previous message (by thread): rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.6.4-noversion.patch, NONE, 1.1 NetworkManager-pptp-0.6.4-pppdplugin.patch, NONE, 1.1 NetworkManager-pptp-0.6.6-desktop.patch, NONE, 1.1 NetworkManager-pptp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/epel-release/EL-4 epel-release.spec, 1.2, 1.3 epel-testing.repo, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list