afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleaned up core.emane, core.services, core.xml, fixed bug introduced in coreobj.py

Browse source
This commit is contained in:
bharnden 2018-10-11 17:26:34 -07:00
parent eb04e0a79f
commit 12cc40d3d3
11 changed files with 11 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

14
daemon/core/services/ucarp.py
View file

@ -107,11 +107,6 @@ ${UCARP_EXEC} -B ${UCARP_OPTS}
"""
Generate a shell script used to boot the Ucarp daemons.
"""
try:
ucarp_bin = node.session.cfg['ucarp_bin']
except KeyError:
ucarp_bin = "/usr/sbin/ucarp"
return """\
#!/bin/sh
# Location of the UCARP config directory
@ -129,11 +124,6 @@ ${UCARP_CFGDIR}/default.sh
"""
Generate a shell script used to start the virtual ip
"""
try:
ucarp_bin = node.session.cfg['ucarp_bin']
except KeyError:
ucarp_bin = "/usr/sbin/ucarp"
return """\
#!/bin/bash
@ -156,10 +146,6 @@ fi
"""
Generate a shell script used to stop the virtual ip
"""
try:
ucarp_bin = node.session.cfg['ucarp_bin']
except KeyError:
ucarp_bin = "/usr/sbin/ucarp"
return """\
#!/bin/bash