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

Add path lookup directory for Qemu on OSX.

Browse Source
This commit is contained in:
grossmj 2014-10-20 11:56:30 -06:00
parent b88abb7c91
commit e261263aab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/qemu/__init__.py
View File

@ -628,6 +628,8 @@ class Qemu(IModule):
paths.append(os.path.join(os.environ["PROGRAMFILES(X86)"], "qemu")) paths.append(os.path.join(os.environ["PROGRAMFILES(X86)"], "qemu"))
if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]): if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]):
paths.append(os.path.join(os.environ["PROGRAMFILES"], "qemu")) 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: for path in paths:
try: try:
for f in os.listdir(path): for f in os.listdir(path):

4
gns3server/templates/upload.html
View File

@ -13,10 +13,10 @@ File: <input type="file" name="file" />
</form> </form>
{%if items%} {%if items%}
<h3>Files on {{host}}</h3> <h3>Files on {{host}}</h3>
<ul> <ol>
{%for item in items%} {%for item in items%}
<li>{{path}}/{{item}}</a></li> <li>{{path}}/{{item}}</a></li>
{%end%} {%end%}
{%end%} {%end%}
</ul> </ol>
</body> </body>