From f84fe396738702d5eb2ef5d8928d0b4178ad7cef Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Nov 23 2005 21:24:10 +0000
Subject: workaround latest selinux policy: mount /var/run/dbus under chroot instead

    of /var/run/dbus/system-bus-socket

---

diff --git a/bind.spec b/bind.spec
index 0f7d68e..29a0d72 100644
--- a/bind.spec
+++ b/bind.spec
@@ -10,7 +10,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serve
 Name: bind
 License: BSD-like
 Version: 9.3.1
-Release: 22
+Release: 24
 Epoch:   24
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -731,6 +731,11 @@ fi;
 :;
 
 %changelog
+* Wed Nov 23 2005 Jason Vas Dias <jvdias@redhat.com> - 24:9.3.1-24
+- allow D-BUS support to work in bind-chroot environment:
+  workaround latest selinux policy by mounting /var/run/dbus/
+  under chroot instead of /var/run/dbus/system-bus-socket
+
 * Sun Nov 13 2005 Jason Vas Dias <jvdias@redhat.com> - 24:9.3.1-22
 - fix bug 172632 - remove .la files
 - ship namedGetForwarders and namedSetForwarders scripts
diff --git a/named.init b/named.init
index a5a2a79..95cae9d 100755
--- a/named.init
+++ b/named.init
@@ -64,7 +64,7 @@ start() {
 		if [ ! -d ${ROOTDIR}/proc ]; then
 		    mkdir -p ${ROOTDIR}/proc
 		fi
-		if ! egrep -q "/proc ${ROOTDIR}/proc" /proc/mounts; then
+		if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then
 		    mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
 		dbus=0;
@@ -74,10 +74,12 @@ start() {
 	            fi;
 	        done
 		if [ $dbus -eq 1 ]; then
-		    if ! /bin/mount | egrep -q "^/var/run/dbus/system_bus_socket on ${ROOTDIR}/var/run/dbus/system_bus_socket"; then
+		    if ! egrep '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then
 			mkdir -p ${ROOTDIR}/var/run/dbus
-			touch ${ROOTDIR}/var/run/dbus/system_bus_socket;
-			mount --bind /var/run/dbus/system_bus_socket ${ROOTDIR}/var/run/dbus/system_bus_socket > /dev/null 2>&1;
+			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;
 		    fi;		    
 		fi;		
 	fi