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

Merge branch '5.1' of git-ssh.web.boeing.com:Boeing-CORE/CORE into 5.1

Browse source
This commit is contained in:
Blake J. Harnden 2018-01-12 09:12:55 -08:00
commit 5344d62a7a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/sbin/core-daemon
View file

@ -35,7 +35,6 @@ from core.api import coreapi
from core.corehandlers import CoreDatagramRequestHandler from core.corehandlers import CoreDatagramRequestHandler
from core.enumerations import MessageFlags from core.enumerations import MessageFlags
from core.enumerations import RegisterTlvs from core.enumerations import RegisterTlvs
from core.misc import nodemaps
from core.misc import nodeutils from core.misc import nodeutils
from core.misc.utils import closeonexec from core.misc.utils import closeonexec
from core.misc.utils import daemonize from core.misc.utils import daemonize
@ -347,11 +346,13 @@ if __name__ == "__main__":
# configure nodes to use # configure nodes to use
if len(sys.argv) == 2 and sys.argv[1] == "ovs": if len(sys.argv) == 2 and sys.argv[1] == "ovs":
from core.netns.openvswitch import OVS_NODES from core.netns.openvswitch import OVS_NODES
nodeutils.update_node_map(OVS_NODES) nodeutils.update_node_map(OVS_NODES)
# update with BSD based nodes # update with BSD based nodes
if os.uname()[0] == "FreeBSD": if os.uname()[0] == "FreeBSD":
from core.bsd.nodes import BSD_NODES from core.bsd.nodes import BSD_NODES
nodeutils.update_node_map(BSD_NODES) nodeutils.update_node_map(BSD_NODES)
# load default services # load default services