rpms/bind
5
0
Fork 1
Code Issues Pull Requests Releases Activity

added timeout to init script

Browse Source
This commit is contained in:
Martin Stransky 2006-10-05 13:06:25 +00:00
parent 66f11969cf
commit 2e702b326b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bind.spec
View File

@ -785,6 +785,9 @@ rm -rf ${RPM_BUILD_ROOT}
* Thu Oct 5 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-3 * Thu Oct 5 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-3
- added fix from #209400 - Bind Init Script does not create - added fix from #209400 - Bind Init Script does not create
the PID file always, created by Jeff Means the PID file always, created by Jeff Means
- added timeout to stop section of init script.
The default is 100 sec. and can be adjusted by NAMED_SHUTDOWN_TIMEOUT
shell variable.
* Mon Oct 2 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-2 * Mon Oct 2 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-2
- removed chcon from post script, replaced by restorecon - removed chcon from post script, replaced by restorecon

30
named.init
View File

@ -19,6 +19,9 @@
[ -r /etc/sysconfig/named ] && . /etc/sysconfig/named [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named
# Don't kill named dunring clean-up
NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100}
if [ -n "$ROOTDIR" ]; then if [ -n "$ROOTDIR" ]; then
ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`; ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`;
rdl=`/usr/bin/readlink $ROOTDIR`; rdl=`/usr/bin/readlink $ROOTDIR`;
@ -193,18 +196,27 @@ stop() {
echo -n $"Stopping $named: " echo -n $"Stopping $named: "
/usr/sbin/rndc stop >/dev/null 2>&1 /usr/sbin/rndc stop >/dev/null 2>&1
RETVAL=$? RETVAL=$?
if [ $RETVAL -eq 0 ]; then
timeout=0
while : ; do
if /sbin/pidof -o %PPID $named >/dev/null; then
if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
killproc $named -TERM >/dev/null 2>&1
RETVAL=$?
break
else
sleep 2 && echo -n "."
timeout=$((timeout+2))
fi;
else
break
fi;
done
fi;
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/named rm -f /var/lock/subsys/named
rm -f /var/run/named.pid rm -f /var/run/named.pid
rm -f /var/run/named_sdb.pid 2>/dev/null rm -f /var/run/named_sdb.pid 2>/dev/null
elif /sbin/pidof -o %PPID $named >/dev/null; then
killproc $named -TERM >/dev/null 2>&1
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/named
rm -f /var/run/named.pid
rm -f /var/run/named_sdb.pid 2>/dev/null
fi;
fi; fi;
if [ $RETVAL -eq 0 ]; then if [ $RETVAL -eq 0 ]; then
success success