Commit ad82b7e0 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

move step 1:

renamed src/bin/bind-cfgd to src/bin/cfgmgr
moved src/lib/config/python/bind-cfgd.py to src/bin/cfgmgr/b10-cfgmgr


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@599 e5f2f494-b856-4b98-b285-d166d9295462
parent e9b6a2ea
......@@ -148,7 +148,7 @@ AC_CONFIG_FILES([Makefile
src/bin/bind10/Makefile
src/bin/cmd-ctrld/Makefile
src/bin/bindctl/Makefile
src/bin/bind-cfgd/Makefile
src/bin/cfgmgr/Makefile
src/bin/host/Makefile
src/bin/msgq/Makefile
src/bin/parkinglot/Makefile
......@@ -164,7 +164,7 @@ AC_CONFIG_FILES([Makefile
src/lib/dns/Makefile
src/lib/dns/cpp/Makefile
])
AC_OUTPUT([src/bin/bind-cfgd/bind-cfgd
AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
src/bin/cmd-ctrld/cmd-ctrld
src/bin/bind10/bind10
src/bin/bind10/bind10_test
......@@ -173,7 +173,7 @@ AC_OUTPUT([src/bin/bind-cfgd/bind-cfgd
src/bin/msgq/msgq_test
src/bin/parkinglot/config.h
], [
chmod +x src/bin/bind-cfgd/bind-cfgd
chmod +x src/bin/cfgmgr/b10-cfgmgr
chmod +x src/bin/cmd-ctrld/cmd-ctrld
chmod +x src/bin/bind10/bind10
chmod +x src/bin/bindctl/bindctl
......
SUBDIRS = bind10 bindctl bind-cfgd msgq parkinglot host cmd-ctrld
SUBDIRS = bind10 bindctl cfgmgr msgq parkinglot host cmd-ctrld
......@@ -5,7 +5,7 @@ export PYTHON_EXEC
BIND10_PATH=@abs_top_srcdir@/src/bin/bind10
PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/parkinglot:@abs_top_srcdir@/src/bin/bind-cfgd:@abs_top_srcdir@/src/bin/cmd-ctrld:$PATH
PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/parkinglot:@abs_top_srcdir@/src/bin/cfgmgr:@abs_top_srcdir@/src/bin/cmd-ctrld:$PATH
export PATH
PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/config/python
......
......@@ -152,19 +152,19 @@ class BoB:
# start the configuration manager
if self.verbose:
sys.stdout.write("Starting bind-cfgd\n")
sys.stdout.write("Starting b10-cfgmgr\n")
try:
bind_cfgd = ProcessInfo("bind-cfgd", "bind-cfgd")
bind_cfgd = ProcessInfo("b10-cfgmgr", "b10-cfgmgr")
except Exception as e:
c_channel.process.kill()
return "Unable to start bind-cfgd; " + str(e)
return "Unable to start b10-cfgmgr; " + str(e)
self.processes[bind_cfgd.pid] = bind_cfgd
if self.verbose:
sys.stdout.write("Started bind-cfgd (PID %d)\n" % bind_cfgd.pid)
sys.stdout.write("Started b10-cfgmgr (PID %d)\n" % bind_cfgd.pid)
# TODO: once this interface is done, replace self.cc_session
# by this one
# sleep until bind-cfgd is fully up and running, this is a good place
# sleep until b10-cfgmgr is fully up and running, this is a good place
# to have a (short) timeout on synchronized groupsend/receive
time.sleep(1)
if self.verbose:
......
pkglibexecdir = $(libexecdir)/@PACKAGE@
pkglibexec_SCRIPTS = bind-cfgd
pkglibexec_SCRIPTS = b10-cfgmgr
#!/bin/sh
# use build time srcdir for now
BINPATH=@abs_top_srcdir@/src/lib/config/python
BINPATH=@abs_top_srcdir@/src/bin/cfgmgr
LIBPATH=@abs_top_srcdir@/src/lib/cc/python
PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
PYTHONPATH=${LIBPATH}:${PYTHONPATH} ${PYTHON_EXEC} ${BINPATH}/bind-cfgd.py
PYTHONPATH=${LIBPATH}:${PYTHONPATH} ${PYTHON_EXEC} ${BINPATH}/b10-cfgmgr.py
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment