From e261263aab7cbce83d7c9b5db85fa1a4f08b4d9f Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 20 Oct 2014 11:56:30 -0600 Subject: [PATCH] Add path lookup directory for Qemu on OSX. --- gns3server/modules/qemu/__init__.py | 2 ++ gns3server/templates/upload.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gns3server/modules/qemu/__init__.py b/gns3server/modules/qemu/__init__.py index 754ffbbf8..b9884e8e3 100644 --- a/gns3server/modules/qemu/__init__.py +++ b/gns3server/modules/qemu/__init__.py @@ -628,6 +628,8 @@ class Qemu(IModule): paths.append(os.path.join(os.environ["PROGRAMFILES(X86)"], "qemu")) if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]): paths.append(os.path.join(os.environ["PROGRAMFILES"], "qemu")) + elif sys.platform.startswith("darwin"): + paths.append(os.path.join(os.getcwd(), "../Resources/Qemu/bin/")) for path in paths: try: for f in os.listdir(path): diff --git a/gns3server/templates/upload.html b/gns3server/templates/upload.html index e8310dc08..f34e49416 100644 --- a/gns3server/templates/upload.html +++ b/gns3server/templates/upload.html @@ -13,10 +13,10 @@ File: {%if items%}

Files on {{host}}

- + \ No newline at end of file