NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 15:21:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle committed 2016-05-24 10:13:53 +02:00
2 parents 0aa81b5fa5 cdd54b951a
commit da6cb13338
10 files changed
+69 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/vpcs/vpcs_vm.py
+4 -2
View File
@@ -420,8 +420,10 @@ class VPCSVM(BaseNode):
command.extend(["-m", str(self._manager.get_mac_id(self.id))]) # the unique ID is used to set the MAC address offset
command.extend(["-i", "1"]) # option to start only one VPC instance
command.extend(["-F"]) # option to avoid the daemonization of VPCS
if self._vpcs_version > parse_version("0.8"):
command.extend(["-R"]) # disable relay feature of VPCS (starting with VPCS 0.8)
if self._vpcs_version >= parse_version("0.8b"):
command.extend(["-R"]) # disable the relay feature of VPCS (starting with VPCS 0.8)
else:
log.warn("The VPCS relay feature could not be disabled because the VPCS version is below 0.8b")
nio = self._ethernet_adapter.get_nio(0)
if nio: