rpms/bind/devel named.init,1.37,1.38

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Oct 28 20:12:22 UTC 2005


Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26791

Modified Files:
	named.init 
Log Message:
check for -D option properly


Index: named.init
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/named.init,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- named.init	19 Oct 2005 21:48:56 -0000	1.37
+++ named.init	28 Oct 2005 20:12:12 -0000	1.38
@@ -67,14 +67,19 @@
 		if ! egrep -q "/proc ${ROOTDIR}/proc" /proc/mounts; then
 		    mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 
 		fi
-		if echo "$OPTIONS" | egrep -q '(\<|['"'"'"\ ])-D(\>|['"'"'"\ ])'; then
+		dbus=0;
+		for a in $OPTIONS; do
+		    if [ $a  = "-D" ]; then
+			dbus=1;
+	            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
 			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;
 		    fi;		    
-		fi;
-		
+		fi;		
 	fi
 	no_write_master_zones=0
 	if [ -e /etc/selinux/config ]; then




More information about the fedora-cvs-commits mailing list