rpms/nfs-utils/devel nfs-utils.spec, 1.144, 1.145 nfs.init, 1.25, 1.26 nfslock.init, 1.16, 1.17
Steve Dickson (steved)
fedora-extras-commits at redhat.com
Wed May 16 17:35:29 UTC 2007
Author: steved
Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7955
Modified Files:
nfs-utils.spec nfs.init nfslock.init
Log Message:
- Make sure the condrestarts exit with a zero value (bz 240225)
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- nfs-utils.spec 15 May 2007 15:33:30 -0000 1.144
+++ nfs-utils.spec 16 May 2007 17:34:55 -0000 1.145
@@ -2,7 +2,7 @@
Name: nfs-utils
URL: http://sourceforge.net/projects/nfs
Version: 1.0.12
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
# group all 32bit related archs
@@ -316,6 +316,9 @@
%endif
%changelog
+* Wed May 16 2007 Steve Dickson <steved at redhat.com> 1.0.10-16
+- Make sure the condrestarts exit with a zero value (bz 240225)
+
* Wed May 10 2007 Steve Dickson <steved at redhat.com> 1.0.12-5
- Fix mount.nfs4 to display correct error message (bz 227212)
- Updated mountd and showmount reverse lookup flags (bz 220772)
Index: nfs.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nfs.init 12 May 2007 12:35:44 -0000 1.25
+++ nfs.init 16 May 2007 17:34:55 -0000 1.26
@@ -44,6 +44,8 @@
# Remote quota server
[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad`
+RETVAL=0
+
# See how we were called.
case "$1" in
start)
@@ -65,11 +67,14 @@
[ -n "$RQUOTAD_PORT" ] \
&& RPCRQUOTADOPTS="$RPCRQUOTADOPTS -p $RQUOTAD_PORT"
daemon rpc.rquotad $RPCRQUOTADOPTS
+ RETVAL=$?
echo
fi
echo -n $"Starting NFS daemon: "
daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT
+ RETVAL=$?
echo
+ [ $RETVAL -ne 0 ] && exit $RETVAL
[ -n "$MOUNTD_PORT" ] \
&& RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT"
@@ -91,6 +96,7 @@
echo -n $"Starting NFS mountd: "
daemon rpc.mountd $RPCMOUNTDOPTS
+ RETVAL=$?
echo
touch /var/lock/subsys/nfs
@@ -121,7 +127,12 @@
fi
# Do it the last so that clients can still access the server
# when the server is running.
- action $"Shutting down NFS services: " /usr/sbin/exportfs -au
+ cnt=`/usr/sbin/exportfs -v | /usr/bin/wc -l`
+ if [ $cnt -gt 0 ]; then
+ action $"Shutting down NFS services: " /usr/sbin/exportfs -au
+ else
+ action $"Shutting down NFS services: " /bin/false
+ fi
rm -f /var/lock/subsys/nfs
;;
status)
@@ -131,6 +142,7 @@
if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
status rpc.rquotad
fi
+ RETVAL=$?
;;
restart)
$0 stop
Index: nfslock.init
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfslock.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nfslock.init 12 May 2007 12:35:44 -0000 1.16
+++ nfslock.init 16 May 2007 17:34:55 -0000 1.17
@@ -95,9 +95,9 @@
echo -n $"Stopping NFS statd: "
killproc rpc.statd
- RETVAL=0
+ RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nfslock
+ rm -f /var/lock/subsys/nfslock
return $RETVAL
}
@@ -149,4 +149,4 @@
exit 1
esac
-exit $?
+exit $RETVAL
More information about the fedora-extras-commits
mailing list