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

Merge branch 'develop' into coretk-enhance/gui-logging

Browse source
This commit is contained in:
Huy Pham 2020-02-03 12:01:58 -08:00
commit b7206fe7b9
4 changed files with 56 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/emulator/coreemu.py
View file

@ -61,6 +61,9 @@ class CoreEmu:
self.service_manager = ConfigServiceManager()
config_services_path = os.path.abspath(os.path.dirname(configservices.__file__))
self.service_manager.load(config_services_path)
custom_dir = self.config.get("custom_config_services_dir")
if custom_dir:
self.service_manager.load(custom_dir)
# catch exit event
atexit.register(self.shutdown)

1
daemon/core/nodes/netclient.py
View file

@ -222,6 +222,7 @@ class LinuxNetClient:
self.run(f"{IP_BIN} link set {name} type bridge stp_state 0")
self.run(f"{IP_BIN} link set {name} type bridge forward_delay 0")
self.run(f"{IP_BIN} link set {name} type bridge mcast_snooping 0")
self.run(f"{IP_BIN} link set {name} type bridge group_fwd_mask 65528")
self.device_up(name)
def delete_bridge(self, name: str) -> None: