arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

QEMU config disk - add missing config disk to image directory

Browse Source 
(cherry picked from commit 2e0fba925b)
This commit is contained in:
Bernhard Ehlers 2020-04-16 11:07:56 +02:00
parent 0db0f6256b
commit 347035a99b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gns3server/compute/qemu/qemu_vm.py
View File

@ -46,6 +46,7 @@ from ..nios.nio_tap import NIOTAP
from ..base_node import BaseNode from ..base_node import BaseNode
from ...schemas.qemu import QEMU_OBJECT_SCHEMA, QEMU_PLATFORMS from ...schemas.qemu import QEMU_OBJECT_SCHEMA, QEMU_PLATFORMS
from ...utils.asyncio import monitor_process from ...utils.asyncio import monitor_process
from ...utils.get_resource import get_resource
from ...utils.images import md5sum from ...utils.images import md5sum
from ...utils import macaddress_to_int, int_to_macaddress from ...utils import macaddress_to_int, int_to_macaddress
@ -130,19 +131,31 @@ class QemuVM(BaseNode):
self.adapters = 1 # creates 1 adapter by default self.adapters = 1 # creates 1 adapter by default
# config disk # config disk
self.config_disk_name = "config.img" config_disk_name = "config.img"
self.config_disk_name = ""
self.config_disk_image = ""
if not shutil.which("mcopy"): if not shutil.which("mcopy"):
log.warning("Config disk: 'mtools' are not installed.") log.warning("Config disk: 'mtools' are not installed.")
self.config_disk_name = ""
self.config_disk_image = ""
else: else:
try: try:
self.config_disk_image = self.manager.get_abs_image_path( self.config_disk_image = self.manager.get_abs_image_path(
self.config_disk_name, self.project.path) config_disk_name, self.project.path)
self.config_disk_name = config_disk_name
except (NodeError, ImageMissingError) as e: except (NodeError, ImageMissingError) as e:
log.warning("Config disk: {}".format(e)) config_disk_zip = get_resource("compute/qemu/resources/{}.zip"
self.config_disk_name = "" .format(config_disk_name))
self.config_disk_image = "" if config_disk_zip and os.path.exists(config_disk_zip):
directory = self.manager.get_images_directory()
try:
unpack_zip(config_disk_zip, directory)
self.config_disk_image = os.path.join(directory,
config_disk_name)
self.config_disk_name = config_disk_name
except OSError as e:
log.warning("Config disk creation: {}".format(e))
else:
log.warning("Config disk: image '{}' missing"
.format(config_disk_name))
log.info('QEMU VM "{name}" [{id}] has been created'.format(name=self._name, id=self._id)) log.info('QEMU VM "{name}" [{id}] has been created'.format(name=self._name, id=self._id))

BIN
gns3server/compute/qemu/resources/config.img.zip Normal file
View File

Binary file not shown.