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

Merge branch 'master' into 2.1

Browse Source
This commit is contained in:
Julien Duponchelle committed 2017-07-11 18:59:50 +02:00
2 parents 8eb060304a d525f721a6
commit 699ecb7c89
7 files changed
+338 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/iou/iou_vm.py
+2 -2
View File
@@ -182,9 +182,9 @@ class IOUVM(BaseNode):
except OSError as e:
raise IOUError("Cannot read ELF header for IOU image '{}': {}".format(self._path, e))
# IOU images must start with the ELF magic number, be 32-bit, little endian
# IOU images must start with the ELF magic number, be 32-bit or 64-bit, little endian
# and have an ELF version of 1 normal IOS image are big endian!
if elf_header_start != b'\x7fELF\x01\x01\x01':
if elf_header_start != b'\x7fELF\x01\x01\x01' and elf_header_start != b'\x7fELF\x02\x01\x01':
raise IOUError("'{}' is not a valid IOU image".format(self._path))
if not os.access(self._path, os.X_OK):