# 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
from sendfile import sendfile
-class DiskError(Exception):
- pass
-
dd = get_command('dd')
dmsetup = get_command('dmsetup')
losetup = get_command('losetup')
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))
return loop
def _dir_to_disk(self):
- raise NotImplementedError
+ raise FatalError("Using a directory as media source is not supported "
+ "yet!")
def cleanup(self):
"""Cleanup internal data. This needs to be called before the
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):
- success('looks like a directory')
+ self.out.success('looks like a directory')
return self._losetup(self._dir_to_disk())
elif stat.S_ISREG(mode):
- success('looks like an image file')
+ self.out.success('looks like an image file')
sourcedev = self._losetup(self.source)
elif not stat.S_ISBLK(mode):
raise ValueError("Invalid media source. Only block devices, "
- "regular files and directories are supported.")
+ "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)
snapshot = uuid.uuid4().hex
tablefd, table = tempfile.mkstemp()
try:
- os.write(tablefd, "0 %d snapshot %s %s n 8" % \
- (int(size), sourcedev, cowdev))
+ 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,
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.size = 0
self.meta = {}
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)
+ 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")
if len(roots) > 1:
raise FatalError("Multiple operating systems found."
- "We only support images with one filesystem.")
+ "We only support images with one OS.")
self.root = roots[0]
self.guestfs_device = self.g.part_to_dev(self.root)
- self.meta['SIZE'] = self.g.blockdev_getsize64(self.guestfs_device)
+ self.size = self.g.blockdev_getsize64(self.guestfs_device)
self.meta['PARTITION_TABLE'] = \
- self.g.part_get_parttype(self.guestfs_device)
+ self.g.part_get_parttype(self.guestfs_device)
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."""
self.progressbar.goto((position * 100) // total)
- def mount(self):
+ def mount(self, readonly=False):
"""Mount all disk partitions in a correct order."""
- output("Mounting image...", False)
+ mount = self.g.mount_ro if readonly else self.g.mount
+ 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.
mps.sort(compare)
for mp, dev in mps:
try:
- self.g.mount(dev, mp)
+ 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."""
def _last_partition(self):
if self.meta['PARTITION_TABLE'] not in 'msdos' 'gpt':
msg = "Unsupported partition table: %s. Only msdos and gpt " \
- "partition tables are supported" % self.meta['PARTITION_TABLE']
+ "partition tables are supported" % self.meta['PARTITION_TABLE']
raise FatalError(msg)
- is_extended = lambda p: self.g.part_get_mbr_id(
- self.guestfs_device, p['part_num']) == 5
- is_logical = lambda p: self.meta['PARTITION_TABLE'] != 'msdos' and \
- p['part_num'] > 4
+ is_extended = lambda p: \
+ self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) == 5
+ is_logical = lambda p: \
+ self.meta['PARTITION_TABLE'] != 'msdos' and p['part_num'] > 4
partitions = self.g.part_list(self.guestfs_device)
last_partition = partitions[-1]
ATTENTION: make sure unmount is called before shrink
"""
- get_fstype = lambda p: self.g.vfs_type("%s%d" % \
- (self.guestfs_device, p['part_num']))
- is_logical = lambda p: self.meta['PARTITION_TABLE'] == 'msdos' and \
- p['part_num'] > 4
- is_extended = lambda p: self.meta['PARTITION_TABLE'] == 'msdos' and \
- self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) == 5
+ get_fstype = lambda p: \
+ self.g.vfs_type("%s%d" % (self.guestfs_device, p['part_num']))
+ is_logical = lambda p: \
+ self.meta['PARTITION_TABLE'] == 'msdos' and p['part_num'] > 4
+ is_extended = lambda p: \
+ self.meta['PARTITION_TABLE'] == 'msdos' and \
+ self.g.part_get_mbr_id(self.guestfs_device, p['part_num']) == 5
part_add = lambda ptype, start, stop: \
- self.g.part_add(self.guestfs_device, ptype, start, stop)
+ self.g.part_add(self.guestfs_device, ptype, start, stop)
part_del = lambda p: self.g.part_del(self.guestfs_device, p)
part_get_id = lambda p: self.g.part_get_mbr_id(self.guestfs_device, p)
- part_set_id = lambda p, id: self.g.part_set_mbr_id(
- self.guestfs_device, p, id)
- part_get_bootable = lambda p: self.g.part_get_bootable(
- self.guestfs_device, p)
- part_set_bootable = lambda p, bootable: self.g.part_set_bootable(
- self.guestfs_device, p, bootable)
+ part_set_id = lambda p, id: \
+ self.g.part_set_mbr_id(self.guestfs_device, p, id)
+ part_get_bootable = lambda p: \
+ self.g.part_get_bootable(self.guestfs_device, p)
+ part_set_bootable = lambda p, bootable: \
+ self.g.part_set_bootable(self.guestfs_device, p, bootable)
MB = 2 ** 20
- output("Shrinking image (this may take a while)...", False)
+ self.out.output("Shrinking image (this may take a while)...", False)
+
+ sector_size = self.g.blockdev_getss(self.guestfs_device)
last_part = None
fstype = None
if fstype == 'swap':
self.meta['SWAP'] = "%d:%s" % \
- (last_part['part_num'],
- (last_part['part_size'] + MB - 1) // MB)
+ (last_part['part_num'],
+ (last_part['part_size'] + MB - 1) // MB)
part_del(last_part['part_num'])
continue
elif is_extended(last_part):
part_del(last_part['part_num'])
continue
- self.meta['SIZE'] = last_part['part_end'] + 1
+ # Most disk manipulation programs leave 2048 sectors after the last
+ # partition
+ new_size = last_part['part_end'] + 1 + 2048 * sector_size
+ self.size = min(self.size, new_size)
break
if not re.match("ext[234]", fstype):
- warn("Don't know how to resize %s partitions." % fstype)
- return self.meta['SIZE']
+ self.out.warn("Don't know how to resize %s partitions." % fstype)
+ return self.size
part_dev = "%s%d" % (self.guestfs_device, last_part['part_num'])
self.g.e2fsck_f(part_dev)
block_cnt = int(
filter(lambda x: x[0] == 'Block count', out)[0][1])
- sector_size = self.g.blockdev_getss(self.guestfs_device)
start = last_part['part_start'] / sector_size
end = start + (block_size * block_cnt) / sector_size - 1
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))
+
+ assert (new_size <= self.size)
if self.meta['PARTITION_TABLE'] == 'gpt':
ptable = GPTPartitionTable(self.real_device)
- self.meta['SIZE'] = ptable.shrink(new_size)
+ self.size = ptable.shrink(new_size, self.size)
else:
- self.meta['SIZE'] = new_size
+ self.size = min(new_size + 2048 * sector_size, self.size)
+
+ self.out.success("new size is %dMB" % ((self.size + MB - 1) // MB))
- return self.meta['SIZE']
+ return self.size
def dump(self, outfile):
"""Dumps the content of device into a file.
"""
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
+ size = self.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