Fix minor typos

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

diff --git a/image_creator/main.py b/image_creator/main.py
index 7040931..9ff037e 100644 (file)
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -31,10 +31,12 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+from image_creator import get_os_class
 from image_creator.disk import Disk
 import sys
 import os
 
+
 def main():
     if len(sys.argv) != 3:
         sys.exit("Usage: %s <source> <output_file>" %
@@ -45,9 +47,16 @@ def main():
     disk = Disk(source)
     try:
         dev = disk.get_device()
-        metadata = dev.get_image_metadata()
-        for key, val in metadata.iteritems():
-            print "%s=%s" % (key,val)
+        dev.mount()
+        osclass = get_os_class(dev.distro, dev.ostype)
+        image_os = osclass(dev.root, dev.g)
+        metadata = image_os.get_metadata()
+        for key in metadata.keys():
+            print "%s=%s" % (key, metadata[key])
+        image_os.data_cleanup()
+        dev.umount()
+        #dev.shrink()
+
     finally:
         disk.cleanup()
 
@@ -55,4 +64,3 @@ if __name__ == '__main__':
     main()
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :
-