Merge branch 'master' into unstable

gns3server/modules/dynamips/__init__.py

@@ -357,6 +357,17 @@ class Dynamips(BaseManager):
 
         return hypervisor
 
+    @asyncio.coroutine
+    def ghost_ios_support(self, vm):
+
+        ghost_ios_support = self.config.get_section_config("Dynamips").getboolean("ghost_ios_support", True)
+        if ghost_ios_support:
+            with (yield from Dynamips._ghost_ios_lock):
+                try:
+                    yield from self._set_ghost_ios(vm)
+                except GeneratorExit:
+                    log.warning("Could not create ghost IOS image {} (GeneratorExit)".format(vm.name))
+
     @asyncio.coroutine
     def create_nio(self, node, nio_settings):
         """