Add remove_swap_entry sysprep in linux

[snf-image-creator] / image_creator / main.py

diff --git a/image_creator/main.py b/image_creator/main.py
index c6a1c9a..a18d6c7 100644 (file)
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -33,20 +33,18 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from image_creator import get_os_class
 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, error, success, output, \
                                                     FatalError, progress, md5
+from image_creator.os_type import get_os_class
 from image_creator.kamaki_wrapper import Kamaki
 import sys
 import os
 import optparse
 import StringIO
 
-dd = get_command('dd')
-
 
 def check_writable_dir(option, opt_str, value, parser):
     dirname = os.path.dirname(value)
@@ -145,8 +143,8 @@ def image_creator():
 
     if options.outfile is None and not options.upload \
                                             and not options.print_sysprep:
-        raise FatalError("At least one of `-o', `-u' or" \
-                            "`--print-sysprep' must be set")
+        raise FatalError("At least one of `-o', `-u' or `--print-sysprep' " \
+                                                                "must be set")
 
     title = 'snf-image-creator %s' % version
     output(title)
@@ -194,12 +192,12 @@ def image_creator():
         dev.umount()
 
         size = options.shrink and dev.shrink() or dev.size
-        metadata['SIZE'] = str(size // 2 ** 20)
+        metadata.update(dev.meta)
 
         checksum = md5(snapshot, size)
 
         metastring = '\n'.join(
-            ['%s=%s' % (key, value) for (key, value) in metadata.items()])
+                ['%s=%s' % (key, value) for (key, value) in metadata.items()])
         metastring += '\n'
 
         if options.outfile is not None:
@@ -207,13 +205,13 @@ def image_creator():
 
             output('Dumping metadata file...', False)
             with open('%s.%s' % (options.outfile, 'meta'), 'w') as f:
-                    f.write(metastring)
+                f.write(metastring)
             success('done')
 
             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)))
+                f.write('%s %s\n' % (checksum, \
+                                            os.path.basename(options.outfile)))
             success('done')
 
         # Destroy the device. We only need the snapshot from now on