from image_creator.util import get_command
from image_creator.util import warn, progress, success, output, FatalError
-
+from image_creator.gpt import GPTPartitionTable
import stat
import os
import tempfile
def enable(self):
"""Enable a newly created DiskDevice"""
- new_progress = progress("Launching helper VM: ")
- self.progressbar = new_progress()
- self.progressbar.next()
+ self.progressbar = progress("Launching helper VM: ", "percent")
+ self.progressbar.max = 100
+ self.progressbar.goto(1)
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:
- self.progressbar.send(100)
+ output("\rLaunching helper VM...\033[K", False)
+ success("done")
self.progressbar = None
output('Inspecting Operating System...', False)
raise FatalError("Multiple operating systems found."
"We only support images with one filesystem.")
self.root = roots[0]
+ self.gdev = self.g.part_to_dev(self.root)
+ self.parttype = self.g.part_get_parttype(self.gdev)
+
self.ostype = self.g.inspect_get_type(self.root)
self.distro = self.g.inspect_get_distro(self.root)
- success('found a %s system' % self.distro)
+ success('found a(n) %s system' % self.distro)
def destroy(self):
"""Destroy this DiskDevice instance."""
position = array[2]
total = array[3]
- self.progressbar.send((position * 100) // total)
-
- if position == total:
- self.progressbar = None
+ self.progressbar.goto((position * 100) // total)
def mount(self):
"""Mount all disk partitions in a correct order."""
"""
output("Shrinking image (this may take a while)...", False)
- dev = self.g.part_to_dev(self.root)
- parttype = self.g.part_get_parttype(dev)
- if parttype != 'msdos':
+ if self.parttype not in 'msdos' 'gpt':
raise FatalError("You have a %s partition table. "
- "Only msdos partitions are supported" % parttype)
+ "Only msdos and gpt partitions are supported" % self.parttype)
- last_partition = self.g.part_list(dev)[-1]
+ last_partition = self.g.part_list(self.gdev)[-1]
if last_partition['part_num'] > 4:
raise FatalError("This disk contains logical partitions. "
"Only primary partitions are supported.")
- part_dev = "%s%d" % (dev, last_partition['part_num'])
+ part_dev = "%s%d" % (self.gdev, last_partition['part_num'])
fs_type = self.g.vfs_type(part_dev)
if not re.match("ext[234]", fs_type):
warn("Don't know how to resize %s partitions." % vfs_type)
- return
+ return self.size()
self.g.e2fsck_f(part_dev)
self.g.resize2fs_M(part_dev)
block_cnt = int(
filter(lambda x: x[0] == 'Block count', out)[0][1])
- sector_size = self.g.blockdev_getss(dev)
+ sector_size = self.g.blockdev_getss(self.gdev)
start = last_partition['part_start'] / sector_size
end = start + (block_size * block_cnt) / sector_size - 1
- self.g.part_del(dev, last_partition['part_num'])
- self.g.part_add(dev, 'p', start, end)
+ self.g.part_del(self.gdev, last_partition['part_num'])
+ self.g.part_add(self.gdev, 'p', start, end)
new_size = (end + 1) * sector_size
success("new image size is %dMB" %
((new_size + 2 ** 20 - 1) // 2 ** 20))
+
+ if self.parttype == 'gpt':
+ ptable = GPTPartitionTable(self.device)
+ return ptable.shrink(new_size)
+
return new_size
def size(self):
The size returned by this method is the size of the space occupied by
the partitions (including the space before the first partition).
"""
- dev = self.g.part_to_dev(self.root)
- last = self.g.part_list(dev)[-1]
- return last['part_end'] + 1
+ if self.parttype == 'msdos':
+ dev = self.g.part_to_dev(self.root)
+ last = self.g.part_list(dev)[-1]
+ return last['part_end'] + 1
+ elif self.parttype == 'gpt':
+ ptable = GPTPartitionTable(self.device)
+ return ptable.size()
+ else:
+ raise FatalError("Unsupported partition table type: %s" % parttype)
def dump(self, outfile):
"""Dumps the content of device into a file.
blocksize = 2 ** 22 # 4MB
size = self.size()
progress_size = (size + 2 ** 20 - 1) // 2 ** 20 # in MB
- new_progress = progress("Dumping image file: ")
- progressbar = new_progress(progress_size)
+ progressbar = progress("Dumping image file: ", 'mb')
+ progressbar.max = progress_size
source = open(self.device, "r")
try:
dest = open(outfile, "w")
length)
offset += sent
left -= sent
- for i in range((length + 2 ** 20 - 1) // 2 ** 20):
- progressbar.next()
+ progressbar.goto((size - left) // 2 ** 20)
finally:
dest.close()
finally:
source.close()
-
- success('Image file %s was successfully created' % outfile)
+ output("\rDumping image file...\033[K", False)
+ success('image file %s was successfully created' % outfile)
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
projects / snf-image-creator / blobdiff