summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2006-10-30 13:37:47 +0000
committerMartin Stransky <stransky@fedoraproject.org>2006-10-30 13:37:47 +0000
commit511f41b9e2f21b6bcd21e3904679eaca5f9da145 (patch)
treeba6f27f743c9499f9079ba46d62e3a0933e46867
parent28242bb7c351120fd87c39a120a4cf8eeff0fbdf (diff)
downloadbind-511f41b9e2f21b6bcd21e3904679eaca5f9da145.tar.gz
bind-511f41b9e2f21b6bcd21e3904679eaca5f9da145.tar.xz
bind-511f41b9e2f21b6bcd21e3904679eaca5f9da145.zip
added fix for #212549: init script does not unmount /proc filesystem
-rw-r--r--bind.spec1
-rwxr-xr-xnamed.init10
2 files changed, 11 insertions, 0 deletions
diff --git a/bind.spec b/bind.spec
index 0251c1d..1fad543 100644
--- a/bind.spec
+++ b/bind.spec
@@ -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
diff --git a/named.init b/named.init
index 9dcde98..89fd0a2 100755
--- a/named.init
+++ b/named.init
@@ -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