arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Use the registry to find vmrun if the default VMware install path does not exist.

Browse Source
This commit is contained in:
Jeremy 2015-07-21 15:59:29 -06:00
parent 15a7401654
commit abd9c1dc48
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gns3server/modules/vmware/__init__.py
View File

@ -77,12 +77,28 @@ class VMware(BaseManager):
if sys.platform.startswith("win"):
vmrun_path = shutil.which("vmrun")
if vmrun_path is None:
vmrun_ws = os.path.expandvars(r"%PROGRAMFILES(X86)%\VMware\VMware Workstation\vmrun.exe")
vmrun_vix = os.path.expandvars(r"%PROGRAMFILES(X86)%\VMware\VMware VIX\vmrun.exe")
if os.path.exists(vmrun_ws):
vmrun_path = vmrun_ws
elif os.path.exists(vmrun_vix):
vmrun_path = vmrun_vix
import winreg
try:
vmrun_ws = os.path.expandvars(r"%PROGRAMFILES(X86)%\VMware\VMware Workstation\vmrun.exe")
if not os.path.exists(vmrun_ws):
# default path not used, let's look in the registry
hkey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware Workstation")
ws_install_path, _ = winreg.QueryValueEx(hkey, "InstallPath")
vmrun_ws = os.path.join(ws_install_path, "vmrun.exe")
winreg.CloseKey(hkey)
if os.path.exists(vmrun_ws):
vmrun_path = vmrun_ws
except OSError:
pass
else:
vmrun_vix = os.path.expandvars(r"%PROGRAMFILES(X86)%\VMware\VMware VIX\vmrun.exe")
if not os.path.exists(vmrun_vix):
# default path not used, let's look in the registry
hkey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\VMware, Inc.\VMware VIX")
ws_install_path, _ = winreg.QueryValueEx(hkey, "InstallPath")
vmrun_vix = os.path.join(ws_install_path, "vmrun.exe")
if os.path.exists(vmrun_vix):
vmrun_path = vmrun_vix
elif sys.platform.startswith("darwin"):
vmrun_path = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
else:

2
gns3server/utils/interfaces.py
View File

@ -29,9 +29,7 @@ def _get_windows_interfaces_from_registry():
import winreg
#HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces
interfaces = []
try:
hkey = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkCards")