diff options
| author | Martin Stransky <stransky@fedoraproject.org> | 2006-10-30 12:10:16 +0000 |
|---|---|---|
| committer | Martin Stransky <stransky@fedoraproject.org> | 2006-10-30 12:10:16 +0000 |
| commit | 8c7aa7e5fe624850901406ba767a3a2374c5ebf9 (patch) | |
| tree | ebc1f3df13cace6d554d6f6cf72f8c80e52dc15c | |
| parent | 4aeb1a8c255516ef82debecd2e33a2df424dbdf4 (diff) | |
added fixes for #212348, #211249, #211083
| -rw-r--r-- | bind.spec | 9 | ||||
| -rwxr-xr-x | named.init | 12 |
2 files changed, 11 insertions, 10 deletions
@@ -448,7 +448,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; done -/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.136 2006/10/26 08:11:06 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.137 2006/10/30 12:10:15 stransky Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ *\ * NOTE: you only need to create this file if it is to\ * differ from the following default contents: @@ -777,9 +777,10 @@ rm -rf ${RPM_BUILD_ROOT} :; %changelog -* Fri Oct 26 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6 -- fix for #200465: named-checkzone and co. cannot be run - as non-root user +* Mon Oct 30 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-6 +- fix for #200465: named-checkzone and co. cannot be run 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 - fix for #209359: bind-libs from compatlayer CD will not @@ -19,7 +19,7 @@ [ -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} if [ -n "$ROOTDIR" ]; then @@ -107,7 +107,7 @@ start() { mkdir -p ${ROOTDIR}/proc fi 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 if [ $dbusEnabled -eq 1 ]; then if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then @@ -115,7 +115,7 @@ start() { if [ ! -d /var/run/dbus ] ; then mkdir -p /var/run/dbus ; 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 @@ -196,13 +196,15 @@ stop() { echo -n $"Stopping $named: " /usr/sbin/rndc stop >/dev/null 2>&1 RETVAL=$? - if [ $RETVAL -eq 0 ]; then + # is it still here? + if /sbin/pidof -o %PPID $named >/dev/null; 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=$? + echo -n $"no response, killing with -TERM " break else sleep 2 && echo -n "." @@ -232,8 +234,6 @@ rhstatus() { } restart() { stop -# wait a couple of seconds for the named to finish closing down - sleep 2 start } reload() { |