The nfs service is not stopped on reboot or halt (bz 652786)

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2010-12-01 12:02:33 -05:00
parent f6ef5e4f31
commit 5f9e463653
2 changed files with 11 additions and 8 deletions

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.2.3 Version: 1.2.3
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -252,6 +252,9 @@ fi
%attr(4755,root,root) /sbin/umount.nfs4 %attr(4755,root,root) /sbin/umount.nfs4
%changelog %changelog
* Wed Dec 1 2010 Steve Dickson <steved@redhat.com> 1.2.3-4
- The nfs service is not stopped on reboot or halt (bz 652786)
* Mon Nov 29 2010 Steve Dickson <steved@redhat.com> 1.2.3-3 * Mon Nov 29 2010 Steve Dickson <steved@redhat.com> 1.2.3-3
- Updated to latest upstream release: nfs-utils-1-2-4-rc3 - Updated to latest upstream release: nfs-utils-1-2-4-rc3

View File

@ -124,7 +124,7 @@ case "$1" in
RETVAL=$? RETVAL=$?
echo echo
touch /var/lock/subsys/rpc.mountd touch /var/lock/subsys/rpc.mountd
touch /var/lock/subsys/nfsd touch /var/lock/subsys/nfs
# Let rpc.idmapd know that rpc.mountd just started # Let rpc.idmapd know that rpc.mountd just started
[ -x /usr/sbin/rpc.idmapd ] && /sbin/service rpcidmapd condstart [ -x /usr/sbin/rpc.idmapd ] && /sbin/service rpcidmapd condstart
@ -167,7 +167,7 @@ case "$1" in
[ $RETVAL -eq 0 ] && RETVAL=$rval [ $RETVAL -eq 0 ] && RETVAL=$rval
fi fi
[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd stop [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd stop
rm -f /var/lock/subsys/nfsd rm -f /var/lock/subsys/nfs
rm -f /var/lock/subsys/rpc.mountd rm -f /var/lock/subsys/rpc.mountd
;; ;;
status) status)
@ -189,10 +189,10 @@ case "$1" in
;; ;;
reload | force-reload) reload | force-reload)
/usr/sbin/exportfs -r /usr/sbin/exportfs -r
touch /var/lock/subsys/nfsd touch /var/lock/subsys/nfs
;; ;;
probe) probe)
if [ ! -f /var/lock/subsys/nfsd ] ; then if [ ! -f /var/lock/subsys/nfs ] ; then
echo $"start"; exit 0 echo $"start"; exit 0
fi fi
/sbin/pidof rpc.mountd >/dev/null 2>&1; MOUNTD="$?" /sbin/pidof rpc.mountd >/dev/null 2>&1; MOUNTD="$?"
@ -200,13 +200,13 @@ case "$1" in
if [ $MOUNTD = 1 -o $NFSD = 1 ] ; then if [ $MOUNTD = 1 -o $NFSD = 1 ] ; then
echo $"restart"; exit 0 echo $"restart"; exit 0
fi fi
if [ /etc/exports -nt /var/lock/subsys/nfsd ] ; then if [ /etc/exports -nt /var/lock/subsys/nfs ] ; then
echo $"reload"; exit 0 echo $"reload"; exit 0
fi fi
;; ;;
condrestart | try-restart) condrestart | try-restart)
[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condrestart [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condrestart
[ -f /var/lock/subsys/nfsd ] && { [ -f /var/lock/subsys/nfs ] && {
$0 stop $0 stop
$0 start $0 start
RETVAL=$? RETVAL=$?
@ -214,7 +214,7 @@ case "$1" in
;; ;;
condstop) condstop)
[ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condstop [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd condstop
[ -f /var/lock/subsys/nfsd ] && { [ -f /var/lock/subsys/nfs ] && {
$0 stop $0 stop
RETVAL=$? RETVAL=$?
} }