X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/0ae01e26a7eccf4dc5fbc479507c1e0c063fba25..0144d7c741cb742f52ef8755fc315afaa7ea4747:/image_creator/main.py

diff --git a/image_creator/main.py b/image_creator/main.py
old mode 100644
new mode 100755
index 6f0ecf0..ab69b2d
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright 2011 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
@@ -35,8 +37,8 @@ from image_creator import get_os_class
 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
-
+from image_creator.util import get_command, error, success, output
+from image_creator import util
 import sys
 import os
 import optparse
@@ -61,31 +63,29 @@ def parse_options(input_args):
     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)
 
@@ -105,14 +105,18 @@ def parse_options(input_args):
 
 
 def image_creator():
-
     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):
@@ -123,62 +127,50 @@ def image_creator():
     try:
         dev = disk.get_device()
         dev.mount()
+
         osclass = get_os_class(dev.distro, dev.ostype)
         image_os = osclass(dev.root, dev.g)
         metadata = image_os.get_metadata()
 
+        output()
+
         if options.sysprep:
             image_os.sysprep()
-        
+
         if options.cleanup:
             image_os.data_cleanup()
 
         dev.umount()
 
         size = options.shrink and dev.shrink() or dev.size()
-        metadata['size'] = str(size // 2 ** 20)
-        
-        outfile = ""
+        metadata['SIZE'] = str(size // 2 ** 20)
+
         if options.outfile is not None:
-            outfile = options.outfile
             f = open('%s.%s' % (options.outfile, 'meta'), 'w')
             try:
                 for key in metadata.keys():
                     f.write("%s=%s\n" % (key, metadata[key]))
             finally:
                 f.close()
-        else:
-            outfd, outfile = tmpfile.mkstemp()
-            os.close(outfd)
-
-        dd('if=%s' % dev.device,
-            'of=%s' % outfile,
-            'bs=4M', 'count=%d' % ((size + 1) // 2 ** 22))
 
+            dev.dump(options.outfile)
     finally:
+        output('cleaning up...')
         disk.cleanup()
 
-    #The image is ready, lets call kamaki if necessary
-    if options.upload:
-       pass
-
-    if options.outfile is None:
-        os.unlink(outfile)
-
     return 0
 
-COLOR_BLACK = "\033[00m"
-COLOR_RED = "\033[1;31m"
 
 def main():
     try:
         ret = image_creator()
         sys.exit(ret)
     except FatalError as e:
-        print >> sys.stderr, "\n%sError: %s%s\n" % (COLOR_RED, e, COLOR_BLACK)
+        error(e)
         sys.exit(1)
 
 
 if __name__ == '__main__':
     main()
+
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :