# or implied, of GRNET S.A.
from image_creator.util import get_command
-from image_creator.util import warn, progress, success, output, FatalError
+from image_creator.util import FatalError
from image_creator.gpt import GPTPartitionTable
import stat
import os
the Linux kernel.
"""
- def __init__(self, source):
+ 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."""
self._cleanup_jobs = []
self._devices = []
self.source = source
+ self.out = output
def _add_cleanup(self, job, *args):
self._cleanup_jobs.append((job, args))
instance.
"""
- output("Examining source media `%s'..." % self.source, False)
+ self.out.output("Examining source media `%s'..." % self.source, False)
sourcedev = self.source
mode = os.stat(self.source).st_mode
if stat.S_ISDIR(mode):
raise ValueError("Invalid media source. Only block devices, "
"regular files and directories are supported.")
else:
- success('looks like a block device')
+ self.out.success('looks like a block device')
# Take a snapshot and return it to the user
- output("Snapshotting media source...", False)
+ self.out.output("Snapshotting media source...", False)
size = blockdev('--getsize', sourcedev)
cowfd, cow = tempfile.mkstemp()
os.close(cowfd)
finally:
os.unlink(table)
- success('done')
+ self.out.success('done')
return "/dev/mapper/%s" % snapshot
def get_device(self, media):
"""Returns a newly created DiskDevice instance."""
- new_device = DiskDevice(media)
+ new_device = DiskDevice(media, self.out)
self._devices.append(new_device)
new_device.enable()
return new_device
as created by the device-mapper.
"""
- def __init__(self, device, bootable=True):
+ def __init__(self, device, output, bootable=True):
"""Create a new DiskDevice."""
self.real_device = device
+ self.out = output
self.bootable = bootable
self.progress_bar = None
self.guestfs_device = None
self.g = guestfs.GuestFS()
self.g.add_drive_opts(self.real_device, readonly=0)
+ # Before version 1.17.14 the recovery process, which is a fork of the
+ # original process that called libguestfs, did not close its inherited
+ # file descriptors. This can cause problems especially if the parent
+ # process has opened pipes. Since the recovery process is an optional
+ # feature of libguestfs, it's better to disable it.
+ self.g.set_recovery_proc(0)
+ version = self.g.version()
+ if version['major'] > 1 or (version['major'] == 1 and
+ (version['minor'] >= 18 or \
+ (version['minor'] == 17 and version['release'] >= 14))):
+ self.g.set_recovery_proc(1)
+ self.out.output("Enabling recovery proc")
+
#self.g.set_trace(1)
#self.g.set_verbose(1)
def enable(self):
"""Enable a newly created DiskDevice"""
- self.progressbar = progress("Launching helper VM: ", "percent")
- self.progressbar.max = 100
- self.progressbar.goto(1)
+ 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)
- if self.progressbar is not None:
- output("\rLaunching helper VM...\033[K", False)
- success("done")
- self.progressbar = None
+ self.progressbar.success('done')
+ self.progressbar = None
- 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")
self.ostype = self.g.inspect_get_type(self.root)
self.distro = self.g.inspect_get_distro(self.root)
- success('found a(n) %s system' % self.distro)
+ self.out.success('found a(n) %s system' % self.distro)
def destroy(self):
"""Destroy this DiskDevice instance."""
def mount(self):
"""Mount all disk partitions in a correct order."""
- output("Mounting image...", False)
+ self.out.output("Mounting image...", False)
mps = self.g.inspect_get_mountpoints(self.root)
# Sort the keys to mount the fs in a correct order.
try:
self.g.mount(dev, mp)
except RuntimeError as msg:
- warn("%s (ignored)" % msg)
- success("done")
+ self.out.warn("%s (ignored)" % msg)
+ self.out.success("done")
def umount(self):
"""Umount all mounted filesystems."""
MB = 2 ** 20
- output("Shrinking image (this may take a while)...", False)
+ self.out.output("Shrinking image (this may take a while)...", False)
last_part = None
fstype = None
break
if not re.match("ext[234]", fstype):
- warn("Don't know how to resize %s partitions." % fstype)
+ self.out.warn("Don't know how to resize %s partitions." % fstype)
return self.meta['SIZE']
part_dev = "%s%d" % (self.guestfs_device, last_part['part_num'])
part_set_id(last_part['part_num'], last_part['id'])
new_size = (end + 1) * sector_size
- success("new size is %dMB" % ((new_size + MB - 1) // MB))
+ self.out.success("new size is %dMB" % ((new_size + MB - 1) // MB))
if self.meta['PARTITION_TABLE'] == 'gpt':
ptable = GPTPartitionTable(self.real_device)
MB = 2 ** 20
blocksize = 4 * MB # 4MB
size = self.meta['SIZE']
- progress_size = (size + MB - 1) // MB # in MB
- progressbar = progress("Dumping image file: ", 'mb')
- progressbar.max = progress_size
+ progr_size = (size + MB - 1) // MB # in MB
+ progressbar = self.out.Progress(progr_size, "Dumping image file", 'mb')
with open(self.real_device, 'r') as src:
with open(outfile, "w") as dst:
offset += sent
left -= sent
progressbar.goto((size - left) // MB)
- output("\rDumping image file...\033[K", False)
- success('image file %s was successfully created' % outfile)
+ progressbar.success('image file %s was successfully created' % outfile)
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
projects / snf-image-creator / blobdiff