from image_creator import __version__ as version
from image_creator import FatalError
from image_creator.disk import Disk
-from image_creator.util import get_command, error, progress_generator, success
-from clint.textui import puts
-
+from image_creator.util import get_command, error, success, output
+from image_creator import util
import sys
import os
import optparse
parser = optparse.OptionParser(version=version, usage=usage)
parser.add_option("-f", "--force", dest="force", default=False,
- action="store_true", help="Overwrite output files if they exist")
+ action="store_true", help="overwrite output files if they exist")
parser.add_option("--no-cleanup", dest="cleanup", default=True,
- help="Don't cleanup sensitive data before extracting the image",
- action="store_false")
+ help="don't cleanup sensitive data", action="store_false")
parser.add_option("--no-sysprep", dest="sysprep", default=True,
- help="Don't perform system preperation before extracting the image",
- action="store_false")
+ help="don't perform system preperation", action="store_false")
parser.add_option("--no-shrink", dest="shrink", default=True,
- help="Don't shrink any partition before extracting the image",
- action="store_false")
+ help="don't shrink any partition", action="store_false")
parser.add_option("-o", "--outfile", type="string", dest="outfile",
default=None, action="callback", callback=check_writable_dir,
- help="Output image file",
- metavar="FILE")
+ help="dump image to FILE", metavar="FILE")
+
+ parser.add_option("-s", "--silent", dest="silent", default=False,
+ help="silent mode, only output error", action="store_true")
parser.add_option("-u", "--upload", dest="upload", default=False,
- help="Upload image to a pithos repository using kamaki",
- action="store_true")
+ help="upload the image to pithos", action="store_true")
parser.add_option("-r", "--register", dest="register", default=False,
- help="Register image to okeanos using kamaki", action="store_true")
+ help="register the image to ~okeanos", action="store_true")
options, args = parser.parse_args(input_args)
def image_creator():
- puts('snf-image-creator %s\n' % version)
options = parse_options(sys.argv[1:])
+ if options.silent:
+ util.silent = True
+
+ output('snf-image-creator %s\n' % version)
+
if os.geteuid() != 0:
raise FatalError("You must run %s as root" \
% os.path.basename(sys.argv[0]))
- if not options.force:
+ if not options.force and options.outfile is not None:
for extension in ('', '.meta'):
filename = "%s%s" % (options.outfile, extension)
if os.path.exists(filename):
image_os = osclass(dev.root, dev.g)
metadata = image_os.get_metadata()
- puts()
+ output()
if options.sysprep:
image_os.sysprep()
dev.umount()
size = options.shrink and dev.shrink() or dev.size()
- metadata['size'] = str(size // 2 ** 20)
+ metadata['SIZE'] = str(size // 2 ** 20)
if options.outfile is not None:
f = open('%s.%s' % (options.outfile, 'meta'), 'w')
dev.dump(options.outfile)
finally:
- puts('cleaning up...')
+ output('cleaning up...')
disk.cleanup()
return 0