from sendfile import sendfile
-class DiskError(Exception):
- pass
-
dd = get_command('dd')
dmsetup = get_command('dmsetup')
losetup = get_command('losetup')
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
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:
self.out.success('looks like a block device')
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,
# 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))):
+ 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.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)
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 filesystem.")
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.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)
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
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
while True:
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.meta['SIZE'] = min(self.meta['SIZE'], new_size)
break
if not re.match("ext[234]", fstype):
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
- self.out.success("new size is %dMB" % ((new_size + MB - 1) // MB))
+
+ assert (new_size <= self.meta['SIZE'])
if self.meta['PARTITION_TABLE'] == 'gpt':
ptable = GPTPartitionTable(self.real_device)
- self.meta['SIZE'] = ptable.shrink(new_size)
+ self.meta['SIZE'] = ptable.shrink(new_size, self.meta['SIZE'])
else:
- self.meta['SIZE'] = new_size
+ self.meta['SIZE'] = min(new_size + 2048 * sector_size,
+ self.meta['SIZE'])
+
+ self.out.success("new size is %dMB" %
+ ((self.meta['SIZE'] + MB - 1) // MB))
return self.meta['SIZE']
projects / snf-image-creator / blobdiff