diff options
| author | Martin Stransky <stransky@fedoraproject.org> | 2006-10-30 13:37:47 +0000 |
|---|---|---|
| committer | Martin Stransky <stransky@fedoraproject.org> | 2006-10-30 13:37:47 +0000 |
| commit | 7c45f67d3b9a9880c7f8c8b0f340eabb13e8f214 (patch) | |
| tree | 863287de7caeb9784149409c3958f49eb17b7bf6 | |
| parent | 40d9476882b12202102053c8c2f9b36916c433f8 (diff) | |
added fix for #212549: init script does not unmount /proc filesystem
| -rw-r--r-- | bind.spec | 3 | ||||
| -rwxr-xr-x | named.init | 10 |
2 files changed, 12 insertions, 1 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.137 2006/10/30 12:10:15 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.138 2006/10/30 13:37:47 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: @@ -781,6 +781,7 @@ rm -rf ${RPM_BUILD_ROOT} - 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 +- added fix for #212549: init script does not unmount /proc filesystem * Fri Oct 13 2006 Martin Stransky <stransky@redhat.com> - 30:9.3.3-5 - fix for #209359: bind-libs from compatlayer CD will not @@ -220,6 +220,16 @@ stop() { rm -f /var/run/named.pid rm -f /var/run/named_sdb.pid 2>/dev/null fi; + if [ -n "${ROOTDIR}" -a "x${ROOTDIR}" != "x/" ]; then + if egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then + umount ${ROOTDIR}/proc >/dev/null 2>&1 + fi + if [ $dbusEnabled -eq 1 ]; then + if egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then + umount ${ROOTDIR}/var/run/dbus > /dev/null 2>&1 + fi; + fi; + fi; if [ $RETVAL -eq 0 ]; then success else |