[svn] commit: r3989 - in /trunk: ./ src/bin/bindctl/ src/bin/cmdctl/ src/bin/loadzone/ src/bin/msgq/ src/bin/stats/ src/bin/usermgr/ src/bin/xfrin/ src/bin/xfrout/ src/bin/zonemgr/
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Dec 23 15:26:43 UTC 2010
Author: jreed
Date: Thu Dec 23 15:26:42 2010
New Revision: 3989
Log:
This is for trac226.
Fix run_*.sh scripts that are used for development testing
so they use a msgq socket file in the build tree.
I didn't merge from that branch since had 21 conflicts and missing
ranges. My original commit message for r3881 was:
Set BIND10_MSGQ_SOCKET_FILE in environment for every run_*.sh
script (not for unittests though).
It is set to @abs_top_builddir@/msgq_socket
I didn't test all of them and some do not even use it. But it
shouldn't hurt.
This is for Trac ticket #226.
Note I don't patch the src/bin/recurse/run_b10-recurse.sh.in now.
It is now missing and I don't know why.
Modified:
trunk/ChangeLog
trunk/src/bin/bindctl/run_bindctl.sh.in
trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in
trunk/src/bin/loadzone/run_loadzone.sh.in
trunk/src/bin/msgq/run_msgq.sh.in
trunk/src/bin/stats/run_b10-stats.sh.in
trunk/src/bin/stats/run_b10-stats_stub.sh.in
trunk/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in
trunk/src/bin/xfrin/run_b10-xfrin.sh.in
trunk/src/bin/xfrout/run_b10-xfrout.sh.in
trunk/src/bin/zonemgr/run_b10-zonemgr.sh.in
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Thu Dec 23 15:26:42 2010
@@ -1,3 +1,8 @@
+ 136. [bug] jreed
+ Fix run_*.sh scripts that are used for development testing
+ so they use a msgq socket file in the build tree.
+ (Trac #226, svn NNNN)
+
135. [bug] jelte
bindctl (and the configuration manager in general) now no longer
accepts 'unknown' data; i.e. data for modules that it does not know
Modified: trunk/src/bin/bindctl/run_bindctl.sh.in
==============================================================================
--- trunk/src/bin/bindctl/run_bindctl.sh.in (original)
+++ trunk/src/bin/bindctl/run_bindctl.sh.in Thu Dec 23 15:26:42 2010
@@ -26,5 +26,8 @@
B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${BINDCTL_PATH}
exec ${PYTHON_EXEC} -O bindctl $*
Modified: trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in
==============================================================================
--- trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in (original)
+++ trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in Thu Dec 23 15:26:42 2010
@@ -22,6 +22,9 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${CMD_CTRLD_PATH}
${PYTHON_EXEC} b10-cmdctl
Modified: trunk/src/bin/loadzone/run_loadzone.sh.in
==============================================================================
--- trunk/src/bin/loadzone/run_loadzone.sh.in (original)
+++ trunk/src/bin/loadzone/run_loadzone.sh.in Thu Dec 23 15:26:42 2010
@@ -21,5 +21,8 @@
PYTHONPATH=@abs_top_builddir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
LOADZONE_PATH=@abs_top_builddir@/src/bin/loadzone
exec ${LOADZONE_PATH}/b10-loadzone $*
Modified: trunk/src/bin/msgq/run_msgq.sh.in
==============================================================================
--- trunk/src/bin/msgq/run_msgq.sh.in (original)
+++ trunk/src/bin/msgq/run_msgq.sh.in Thu Dec 23 15:26:42 2010
@@ -23,5 +23,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
exec ${PYTHON_EXEC} -O b10-msgq $*
Modified: trunk/src/bin/stats/run_b10-stats.sh.in
==============================================================================
--- trunk/src/bin/stats/run_b10-stats.sh.in (original)
+++ trunk/src/bin/stats/run_b10-stats.sh.in Thu Dec 23 15:26:42 2010
@@ -21,6 +21,9 @@
PYTHONPATH=@abs_top_builddir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
B10_FROM_BUILD=@abs_top_builddir@
export B10_FROM_BUILD
Modified: trunk/src/bin/stats/run_b10-stats_stub.sh.in
==============================================================================
--- trunk/src/bin/stats/run_b10-stats_stub.sh.in (original)
+++ trunk/src/bin/stats/run_b10-stats_stub.sh.in Thu Dec 23 15:26:42 2010
@@ -24,6 +24,9 @@
B10_FROM_BUILD=@abs_top_srcdir@
export B10_FROM_BUILD
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
STATS_PATH=@abs_top_builddir@/src/bin/stats
cd ${STATS_PATH}
Modified: trunk/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in
==============================================================================
--- trunk/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in (original)
+++ trunk/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in Thu Dec 23 15:26:42 2010
@@ -20,6 +20,9 @@
MYPATH_PATH=@abs_top_builddir@/src/bin/usermgr
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
${PYTHON_EXEC} b10-cmdctl-usermgr
Modified: trunk/src/bin/xfrin/run_b10-xfrin.sh.in
==============================================================================
--- trunk/src/bin/xfrin/run_b10-xfrin.sh.in (original)
+++ trunk/src/bin/xfrin/run_b10-xfrin.sh.in Thu Dec 23 15:26:42 2010
@@ -22,6 +22,9 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
${PYTHON_EXEC} b10-xfrin
Modified: trunk/src/bin/xfrout/run_b10-xfrout.sh.in
==============================================================================
--- trunk/src/bin/xfrout/run_b10-xfrout.sh.in (original)
+++ trunk/src/bin/xfrout/run_b10-xfrout.sh.in Thu Dec 23 15:26:42 2010
@@ -22,6 +22,9 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/dns/python/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
${PYTHON_EXEC} b10-xfrout
Modified: trunk/src/bin/zonemgr/run_b10-zonemgr.sh.in
==============================================================================
--- trunk/src/bin/zonemgr/run_b10-zonemgr.sh.in (original)
+++ trunk/src/bin/zonemgr/run_b10-zonemgr.sh.in Thu Dec 23 15:26:42 2010
@@ -22,6 +22,9 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
${PYTHON_EXEC} b10-zonemgr
More information about the bind10-changes
mailing list