fix init scripts so rc will see to shut things down

This commit is contained in:
Peter Jones 2006-01-11 21:55:51 +00:00
parent 9e571557d2
commit ba86d8916c
4 changed files with 20 additions and 14 deletions

View File

@ -1,7 +1,7 @@
Summary: NFS utlilities and supporting daemons for the kernel NFS server. Summary: NFS utlilities and supporting daemons for the kernel NFS server.
Name: nfs-utils Name: nfs-utils
Version: 1.0.8.rc2 Version: 1.0.8.rc2
Release: 1.FC5 Release: 2.FC5
# group all 32bit related archs # group all 32bit related archs
%define all_32bit_archs i386 i686 athlon %define all_32bit_archs i386 i686 athlon
@ -216,7 +216,10 @@ fi
%config /etc/rc.d/init.d/nfslock %config /etc/rc.d/init.d/nfslock
%changelog %changelog
* Mon Jan 9 2006 1.0.8-1 * Wed Jan 11 2006 Peter Jones <pjones@redhat.com> 1.0.8.rc2-2.FC5
- Fix lockfile naming in the initscripts so they're stopped correctly.
* Mon Jan 9 2006 Steve Dickson <SteveD@RedHat.com> 1.0.8.rc2-1.FC5
- Updated to 1.0.8-rc2 release - Updated to 1.0.8-rc2 release
- Broke out libgssapi into its own rpm - Broke out libgssapi into its own rpm
- Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm - Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm

View File

@ -33,6 +33,7 @@ fi
# Try to use machine credentials by default # Try to use machine credentials by default
OPTIONS="" OPTIONS=""
RETVAL=0 RETVAL=0
LOCKFILE=/var/lock/subsys/rpcgssd
prog="rpc.gssd" prog="rpc.gssd"
case "$1" in case "$1" in
@ -41,7 +42,7 @@ case "$1" in
if status $prog > /dev/null ; then if status $prog > /dev/null ; then
exit 0 exit 0
fi fi
rm -f /var/lock/subsys/$prog rm -f $LOCKFILE
echo -n $"Starting RPC gssd: " echo -n $"Starting RPC gssd: "
@ -70,7 +71,7 @@ case "$1" in
daemon $prog ${OPTIONS} daemon $prog ${OPTIONS}
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.gssd [ $RETVAL -eq 0 ] && touch $LOCKFILE
;; ;;
stop) stop)
# Stop daemon. # Stop daemon.
@ -78,7 +79,7 @@ case "$1" in
killproc $prog killproc $prog
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.gssd [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
;; ;;
status) status)
status rpc.gssd status rpc.gssd
@ -90,7 +91,7 @@ case "$1" in
RETVAL=$? RETVAL=$?
;; ;;
condrestart) condrestart)
if [ -f /var/lock/subsys/rpc.gssd ]; then if [ -f $LOCKFILE ]; then
$0 restart $0 restart
RETVAL=$? RETVAL=$?
fi fi

View File

@ -24,6 +24,7 @@ fi
OPTIONS="" OPTIONS=""
RETVAL=0 RETVAL=0
LOCKFILE=/var/lock/subsys/rpcidmapd
prog="rpc.idmapd" prog="rpc.idmapd"
case "$1" in case "$1" in
@ -33,7 +34,7 @@ case "$1" in
killproc $prog "-SIGHUP" > /dev/null killproc $prog "-SIGHUP" > /dev/null
exit 0 exit 0
} }
rm -f /var/lock/subsys/$prog rm -f $LOCKFILE
echo -n $"Starting RPC idmapd: " echo -n $"Starting RPC idmapd: "
@ -56,7 +57,7 @@ case "$1" in
daemon $prog ${OPTIONS} daemon $prog ${OPTIONS}
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.idmapd [ $RETVAL -eq 0 ] && touch $LOCKFILE
;; ;;
stop) stop)
# Stop daemon. # Stop daemon.
@ -64,7 +65,7 @@ case "$1" in
killproc $prog killproc $prog
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.idmapd [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
;; ;;
status) status)
status rpc.idmapd status rpc.idmapd
@ -76,7 +77,7 @@ case "$1" in
RETVAL=$? RETVAL=$?
;; ;;
condrestart) condrestart)
if [ -f /var/lock/subsys/rpc.idmapd ]; then if [ -f $LOCKFILE ]; then
$0 restart $0 restart
RETVAL=$? RETVAL=$?
fi fi

View File

@ -31,6 +31,7 @@ fi
OPTIONS="" OPTIONS=""
RETVAL=0 RETVAL=0
LOCKFILE=/var/lock/subsys/rpcsvcgssd
prog="rpc.svcgssd" prog="rpc.svcgssd"
case "$1" in case "$1" in
@ -39,7 +40,7 @@ case "$1" in
if status $prog > /dev/null ; then if status $prog > /dev/null ; then
exit 0 exit 0
fi fi
rm -f /var/lock/subsys/$prog rm -f $LOCKFILE
echo -n $"Starting RPC svcgssd: " echo -n $"Starting RPC svcgssd: "
@ -69,7 +70,7 @@ case "$1" in
daemon $prog ${OPTIONS} daemon $prog ${OPTIONS}
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.svcgssd [ $RETVAL -eq 0 ] && touch $LOCKFILE
;; ;;
stop) stop)
# Stop daemon. # Stop daemon.
@ -77,7 +78,7 @@ case "$1" in
killproc $prog killproc $prog
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.svcgssd [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
;; ;;
status) status)
status rpc.svcgssd status rpc.svcgssd
@ -89,7 +90,7 @@ case "$1" in
RETVAL=$? RETVAL=$?
;; ;;
condrestart) condrestart)
if [ -f /var/lock/subsys/rpc.svcgssd ]; then if [ -f $LOCKFILE ]; then
$0 restart $0 restart
RETVAL=$? RETVAL=$?
fi fi