X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/f99fe99d6f3beaf5b282267f30c1ca288be92e40..aa816e8c2c55e13a551868b5afd9170cebefb6bd:/image_creator/main.py diff --git a/image_creator/main.py b/image_creator/main.py index 49b76e7..39144bb 100644 --- a/image_creator/main.py +++ b/image_creator/main.py @@ -36,7 +36,7 @@ from image_creator import __version__ as version from image_creator import util from image_creator.disk import Disk -from image_creator.util import get_command, FatalError, MD5 +from image_creator.util import FatalError, MD5 from image_creator.output.cli import SilentOutput, SimpleOutput, \ OutputWthProgress from image_creator.os_type import os_cls @@ -45,6 +45,7 @@ import sys import os import optparse import StringIO +import signal def check_writable_dir(option, opt_str, value, parser): @@ -78,7 +79,7 @@ def parse_options(input_args): help="overwrite output files if they exist") parser.add_option("-s", "--silent", dest="silent", default=False, - help="silent mode, only output errors", + help="output only errors", action="store_true") parser.add_option("-u", "--upload", dest="upload", type="string", @@ -88,20 +89,20 @@ def parse_options(input_args): parser.add_option("-r", "--register", dest="register", type="string", default=False, - help="register the image to ~okeanos as IMAGENAME", + help="register the image with ~okeanos as IMAGENAME", metavar="IMAGENAME") parser.add_option("-a", "--account", dest="account", type="string", - default=account, help="Use this ACCOUNT when " - "uploading/registring images [Default: %s]" % account) + default=account, help="use this ACCOUNT when " + "uploading/registering images [Default: %s]" % account) parser.add_option("-m", "--metadata", dest="metadata", default=[], - help="Add custom KEY=VALUE metadata to the image", + help="add custom KEY=VALUE metadata to the image", action="append", metavar="KEY=VALUE") parser.add_option("-t", "--token", dest="token", type="string", - default=token, help="Use this token when " - "uploading/registring images [Default: %s]" % token) + default=token, help="use this token when " + "uploading/registering images [Default: %s]" % token) parser.add_option("--print-sysprep", dest="print_sysprep", default=False, help="print the enabled and disabled system preparation " @@ -117,12 +118,16 @@ def parse_options(input_args): metavar="SYSPREP") parser.add_option("--no-sysprep", dest="sysprep", default=True, - help="don't perform system preperation", + help="don't perform any system preparation operation", action="store_false") parser.add_option("--no-shrink", dest="shrink", default=True, help="don't shrink any partition", action="store_false") + parser.add_option("--tmpdir", dest="tmp", type="string", default=None, + help="create large temporary image files under DIR", + metavar="DIR") + options, args = parser.parse_args(input_args) if len(args) != 1: @@ -144,6 +149,10 @@ def parse_options(input_args): raise FatalError("Image uploading cannot be performed. No ~okeanos " "token is specified. User -t to set a token.") + if options.tmp is not None and not os.path.isdir(options.tmp): + raise FatalError("The directory `%s' specified with --tmpdir is not " + "valid." % options.tmp) + meta = {} for m in options.metadata: try: @@ -186,14 +195,21 @@ def image_creator(): raise FatalError("Output file %s exists " "(use --force to overwrite it)." % filename) - disk = Disk(options.source, out) + disk = Disk(options.source, out, options.tmp) + + def signal_handler(signum, frame): + disk.cleanup() + + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) try: snapshot = disk.snapshot() dev = disk.get_device(snapshot) # If no customization is to be applied, the image should be mounted ro - readonly = not (options.sysprep or options.shrink) + readonly = (not (options.sysprep or options.shrink) or + options.print_sysprep) dev.mount(readonly) cls = os_cls(dev.distro, dev.ostype) @@ -219,7 +235,7 @@ def image_creator(): metadata = image_os.meta dev.umount() - size = options.shrink and dev.shrink() or dev.meta['SIZE'] + size = options.shrink and dev.shrink() or dev.size metadata.update(dev.meta) # Add command line metadata to the collected ones... @@ -235,12 +251,12 @@ def image_creator(): if options.outfile is not None: dev.dump(options.outfile) - out.output('Dumping metadata file...', False) + out.output('Dumping metadata file ...', False) with open('%s.%s' % (options.outfile, 'meta'), 'w') as f: f.write(metastring) out.success('done') - out.output('Dumping md5sum file...', False) + out.output('Dumping md5sum file ...', False) with open('%s.%s' % (options.outfile, 'md5sum'), 'w') as f: f.write('%s %s\n' % (checksum, os.path.basename(options.outfile))) @@ -267,7 +283,7 @@ def image_creator(): size=len(metastring), remote_path="%s.%s" % (options.upload, 'meta')) out.success('done') - out.output("(4/4) Uploading md5sum file...", False) + out.output("(4/4) Uploading md5sum file ...", False) md5sumstr = '%s %s\n' % (checksum, os.path.basename(options.upload)) kamaki.upload(StringIO.StringIO(md5sumstr), @@ -277,7 +293,7 @@ def image_creator(): out.output() if options.register: - out.output('Registring image to ~okeanos...', False) + out.output('Registering image with ~okeanos ...', False) kamaki.register(options.register, uploaded_obj, metadata) out.success('done') out.output()