Merge remote-tracking branch 'origin/master'

Conflicts: gns3server/modules/virtualbox/virtualbox_vm.py
10 years ago · 31db1a4e84
parent e07347a961 a4e20cd6f6
commit 31db1a4e84
1 changed files with 3 additions and 0 deletions
--- a/gns3server/modules/virtualbox/virtualbox_vm.py
+++ b/gns3server/modules/virtualbox/virtualbox_vm.py
@ -674,6 +674,9 @@ class VirtualBoxVM(object):
        result = self._execute("startvm", args)
        log.debug("started VirtualBox VM: {}".format(result))

+        # add a guest property to let the VM know about the GNS3 name
+        self._execute("guestproperty", ["set", self._vmname, "NameInGNS3", self._name])
+
        if self._enable_remote_console:
            # starts the Telnet to pipe thread
            pipe_name = self._get_pipe_name()