Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
bdde86c0
Commit
bdde86c0
authored
Nov 14, 2011
by
JINMEI Tatuya
Browse files
[1288] fixed startup failure for installed environment.
parent
045c30f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/bin/bind10/bind10_src.py.in
View file @
bdde86c0
...
...
@@ -628,7 +628,7 @@ class BoB:
# ... and start
return self.start_process("b10-resolver", resargs, self.c_channel_env)
def __ld_path_hack(self
, env
):
def __ld_path_hack(self):
# XXX: a quick-hack workaround. xfrin/out will implicitly use
# dynamically loadable data source modules, which will be installed in
# $(libdir).
...
...
@@ -644,7 +644,7 @@ class BoB:
# the same as for the libexec path addition
# TODO: Once #1292 is finished, remove this method and the special
# component, use it as normal component.
c_channel_
env = dict(self.c_channel_env)
env = dict(self.c_channel_env)
if ADD_LIBEXEC_PATH:
cur_path = os.getenv('DYLD_LIBRARY_PATH')
cur_path = '' if cur_path is None else ':' + cur_path
...
...
@@ -653,6 +653,7 @@ class BoB:
cur_path = os.getenv('LD_LIBRARY_PATH')
cur_path = '' if cur_path is None else ':' + cur_path
env['LD_LIBRARY_PATH'] = "@@LIBDIR@@" + cur_path
return env
def start_cmdctl(self):
"""
...
...
@@ -667,24 +668,20 @@ class BoB:
self.cmdctl_port)
def start_xfrin(self):
self.__ld_path_hack(c_channel_env)
# Set up the command arguments.
args = ['b10-xfrin']
if self.verbose:
args += ['-v']
return self.start_process("b10-xfrin", args, c_channel_env)
def start_xfrout(self, c_channel_env):
self.__ld_path_hack(c_channel_env)
return self.start_process("b10-xfrin", args, self.__ld_path_hack())
def start_xfrout(self):
# Set up the command arguments.
args = ['b10-xfrout']
if self.verbose:
args += ['-v']
return self.start_process("b10-xfrout", args,
c_channel_env
)
return self.start_process("b10-xfrout", args,
self.__ld_path_hack()
)
def start_all_components(self):
"""
...
...
src/bin/bind10/bob.spec
View file @
bdde86c0
...
...
@@ -15,7 +15,7 @@
"kind": "dispensable"
},
"b10-xfrin": { "special": "xfrin", "kind": "dispensable" },
"b10-xfrout": { "special": "
X
frout", "kind": "dispensable" },
"b10-xfrout": { "special": "
x
frout", "kind": "dispensable" },
"b10-zonemgr": { "address": "Zonemgr", "kind": "dispensable" },
"b10-stats": { "address": "Stats", "kind": "dispensable" },
"b10-stats-httpd": {
...
...
src/lib/python/isc/bind10/special_component.py
View file @
bdde86c0
...
...
@@ -159,6 +159,7 @@ def get_specials():
'cmdctl'
:
CmdCtl
,
# FIXME: Temporary workaround before #1292 is done
'xfrin'
:
XfrIn
,
'xfrout'
:
XfrOut
,
# TODO: Remove when not needed, workaround before sockcreator works
'setuid'
:
SetUID
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment