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

- Make sure the condrestarts exit with a zero value (bz 240225)

Browse Source
This commit is contained in:
Steve Dickson 2007-05-16 17:34:55 +00:00
parent 6c3f9db2ec
commit f4efa104b6
3 changed files with 20 additions and 5 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.0.12 Version: 1.0.12
Release: 5%{?dist} Release: 6%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -316,6 +316,9 @@ fi
%endif %endif
%changelog %changelog
* Wed May 16 2007 Steve Dickson <steved@redhat.com> 1.0.10-16
- Make sure the condrestarts exit with a zero value (bz 240225)
* Wed May 10 2007 Steve Dickson <steved@redhat.com> 1.0.12-5 * Wed May 10 2007 Steve Dickson <steved@redhat.com> 1.0.12-5
- Fix mount.nfs4 to display correct error message (bz 227212) - Fix mount.nfs4 to display correct error message (bz 227212)
- Updated mountd and showmount reverse lookup flags (bz 220772) - Updated mountd and showmount reverse lookup flags (bz 220772)

14
nfs.init
View File

@ -44,6 +44,8 @@ fi
# Remote quota server # Remote quota server
[ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad` [ -z "$RQUOTAD" ] && RQUOTAD=`type -path rpc.rquotad`
RETVAL=0
# See how we were called. # See how we were called.
case "$1" in case "$1" in
start) start)
@ -65,11 +67,14 @@ case "$1" in
[ -n "$RQUOTAD_PORT" ] \ [ -n "$RQUOTAD_PORT" ] \
&& RPCRQUOTADOPTS="$RPCRQUOTADOPTS -p $RQUOTAD_PORT" && RPCRQUOTADOPTS="$RPCRQUOTADOPTS -p $RQUOTAD_PORT"
daemon rpc.rquotad $RPCRQUOTADOPTS daemon rpc.rquotad $RPCRQUOTADOPTS
RETVAL=$?
echo echo
fi fi
echo -n $"Starting NFS daemon: " echo -n $"Starting NFS daemon: "
daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT daemon rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT
RETVAL=$?
echo echo
[ $RETVAL -ne 0 ] && exit $RETVAL
[ -n "$MOUNTD_PORT" ] \ [ -n "$MOUNTD_PORT" ] \
&& RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT" && RPCMOUNTDOPTS="$RPCMOUNTDOPTS -p $MOUNTD_PORT"
@ -91,6 +96,7 @@ case "$1" in
echo -n $"Starting NFS mountd: " echo -n $"Starting NFS mountd: "
daemon rpc.mountd $RPCMOUNTDOPTS daemon rpc.mountd $RPCMOUNTDOPTS
RETVAL=$?
echo echo
touch /var/lock/subsys/nfs touch /var/lock/subsys/nfs
@ -121,7 +127,12 @@ case "$1" in
fi fi
# Do it the last so that clients can still access the server # Do it the last so that clients can still access the server
# when the server is running. # 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 rm -f /var/lock/subsys/nfs
;; ;;
status) status)
@ -131,6 +142,7 @@ case "$1" in
if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then
status rpc.rquotad status rpc.rquotad
fi fi
RETVAL=$?
;; ;;
restart) restart)
$0 stop $0 stop

6
nfslock.init
View File

@ -95,9 +95,9 @@ stop() {
echo -n $"Stopping NFS statd: " echo -n $"Stopping NFS statd: "
killproc rpc.statd killproc rpc.statd
RETVAL=0 RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/nfslock rm -f /var/lock/subsys/nfslock
return $RETVAL return $RETVAL
} }
@ -149,4 +149,4 @@ case "$1" in
exit 1 exit 1
esac esac
exit $? exit $RETVAL