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

added fixes for #212348, #211249, #211083

Browse Source
This commit is contained in:
Martin Stransky 2006-10-30 12:10:16 +00:00
parent 2e4a40499d
commit 28242bb7c3
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bind.spec
View File

@ -777,9 +777,10 @@ rm -rf ${RPM_BUILD_ROOT}
:; :;
%changelog %changelog
* Fri Oct 26 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6 * Mon Oct 30 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6
- fix for #200465: named-checkzone and co. cannot be run - fix for #200465: named-checkzone and co. cannot be run as non-root user
as non-root user - added fix for #212348: chroot'd named causes df permission denied error
- added fix for #211249, #211083 - problems with stopping named
* Fri Oct 13 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-5 * Fri Oct 13 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-5
- fix for #209359: bind-libs from compatlayer CD will not - fix for #209359: bind-libs from compatlayer CD will not

12
named.init
View File

@ -19,7 +19,7 @@
[ -r /etc/sysconfig/named ] && . /etc/sysconfig/named [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named
# Don't kill named dunring clean-up # Don't kill named during clean-up
NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100} NAMED_SHUTDOWN_TIMEOUT=${NAMED_SHUTDOWN_TIMEOUT:-100}
if [ -n "$ROOTDIR" ]; then if [ -n "$ROOTDIR" ]; then
@ -107,7 +107,7 @@ start() {
mkdir -p ${ROOTDIR}/proc mkdir -p ${ROOTDIR}/proc
fi fi
if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 mount --bind -n /proc ${ROOTDIR}/proc >/dev/null 2>&1
fi fi
if [ $dbusEnabled -eq 1 ]; then if [ $dbusEnabled -eq 1 ]; then
if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
@ -115,7 +115,7 @@ start() {
if [ ! -d /var/run/dbus ] ; then if [ ! -d /var/run/dbus ] ; then
mkdir -p /var/run/dbus ; mkdir -p /var/run/dbus ;
fi; fi;
mount --bind /var/run/dbus ${ROOTDIR}/var/run/dbus > /dev/null 2>&1; mount --bind -n /var/run/dbus ${ROOTDIR}/var/run/dbus > /dev/null 2>&1;
fi; fi;
fi; fi;
fi fi
@ -196,13 +196,15 @@ 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 # is it still here?
if /sbin/pidof -o %PPID $named >/dev/null; then
timeout=0 timeout=0
while : ; do while : ; do
if /sbin/pidof -o %PPID $named >/dev/null; then if /sbin/pidof -o %PPID $named >/dev/null; then
if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
killproc $named -TERM >/dev/null 2>&1 killproc $named -TERM >/dev/null 2>&1
RETVAL=$? RETVAL=$?
echo -n $"no response, killing with -TERM "
break break
else else
sleep 2 && echo -n "." sleep 2 && echo -n "."
@ -232,8 +234,6 @@ rhstatus() {
} }
restart() { restart() {
stop stop
# wait a couple of seconds for the named to finish closing down
sleep 2
start start
} }
reload() { reload() {