from image_creator.util import get_command
from image_creator.util import FatalError
+from image_creator.util import try_fail_repeat
from image_creator.gpt import GPTPartitionTable
-from image_creator.bundle_volume import bundle_volume
+from image_creator.bundle_volume import BundleVolume
+
import stat
import os
import tempfile
import re
import sys
import guestfs
-import time
from sendfile import sendfile
def __init__(self, source, output):
"""Create a new Disk instance out of a source media. The source
- media can be an image file, a block device or a directory."""
+ media can be an image file, a block device or a directory.
+ """
self._cleanup_jobs = []
self._devices = []
self.source = source
self.out = output
+ self.meta = {}
def _add_cleanup(self, job, *args):
self._cleanup_jobs.append((job, args))
def _losetup(self, fname):
loop = losetup('-f', '--show', fname)
loop = loop.strip() # remove the new-line char
- self._add_cleanup(losetup, '-d', loop)
+ self._add_cleanup(try_fail_repeat, losetup, '-d', loop)
return loop
def _dir_to_disk(self):
if self.source == '/':
- return bundle_volume(self.out)
+ bundle = BundleVolume(self.out, self.meta)
+ image = '/var/tmp/%s.diskdump' % uuid.uuid4().hex
+
+ def check_unlink(path):
+ if os.path.exists(path):
+ os.unlink(path)
+
+ self._add_cleanup(check_unlink, image)
+ bundle.create_image(image)
+ return self._losetup(image)
raise FatalError("Using a directory as media source is supported")
def cleanup(self):
mode = os.stat(self.source).st_mode
if stat.S_ISDIR(mode):
self.out.success('looks like a directory')
- return self._losetup(self._dir_to_disk())
+ return self._dir_to_disk()
elif stat.S_ISREG(mode):
self.out.success('looks like an image file')
sourcedev = self._losetup(self.source)
os.write(tablefd, "0 %d snapshot %s %s n 8" %
(int(size), sourcedev, cowdev))
dmsetup('create', snapshot, table)
- self._add_cleanup(dmsetup, 'remove', snapshot)
- # Sometimes dmsetup remove fails with Device or resource busy,
- # although everything is cleaned up and the snapshot is not
- # used by anyone. Add a 2 seconds delay to be on the safe side.
- self._add_cleanup(time.sleep, 2)
+ self._add_cleanup(try_fail_repeat, dmsetup, 'remove', snapshot)
finally:
os.unlink(table)
as created by the device-mapper.
"""
- def __init__(self, device, output, bootable=True):
+ def __init__(self, device, output, bootable=True, meta={}):
"""Create a new DiskDevice."""
self.real_device = device
self.out = output
self.bootable = bootable
+ self.meta = meta
self.progress_bar = None
self.guestfs_device = None
self.size = 0
- self.meta = {}
self.g = guestfs.GuestFS()
self.g.add_drive_opts(self.real_device, readonly=0)
def enable(self):
"""Enable a newly created DiskDevice"""
- self.progressbar = self.out.Progress(100, "Launching helper VM",
- "percent")
- eh = self.g.set_event_callback(self.progress_callback,
- guestfs.EVENT_PROGRESS)
+
+ self.out.output('Launching helper VM (may take a while) ...', False)
+ # self.progressbar = self.out.Progress(100, "Launching helper VM",
+ # "percent")
+ # eh = self.g.set_event_callback(self.progress_callback,
+ # guestfs.EVENT_PROGRESS)
self.g.launch()
self.guestfs_enabled = True
- self.g.delete_event_callback(eh)
- self.progressbar.success('done')
- self.progressbar = None
+ # self.g.delete_event_callback(eh)
+ # self.progressbar.success('done')
+ # self.progressbar = None
+ self.out.success('done')
- self.out.output('Inspecting Operating System...', False)
+ self.out.output('Inspecting Operating System ...', False)
roots = self.g.inspect_os()
if len(roots) == 0:
raise FatalError("No operating system found")
# Close the guestfs handler if open
self.g.close()
- def progress_callback(self, ev, eh, buf, array):
- position = array[2]
- total = array[3]
-
- self.progressbar.goto((position * 100) // total)
+# def progress_callback(self, ev, eh, buf, array):
+# position = array[2]
+# total = array[3]
+#
+# self.progressbar.goto((position * 100) // total)
def mount(self, readonly=False):
"""Mount all disk partitions in a correct order."""