Monkey patch the source to work with gevent

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

diff --git a/image_creator/main.py b/image_creator/main.py
index a12d863..ba7c5be 100644 (file)
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -33,6 +33,9 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+import gevent.monkey  # Monkey-patch everything for gevent early on
+gevent.monkey.patch_all()
+
 from image_creator import __version__ as version
 from image_creator import util
 from image_creator.disk import Disk
@@ -45,6 +48,7 @@ import sys
 import os
 import optparse
 import StringIO
+import signal
 
 
 def check_writable_dir(option, opt_str, value, parser):
@@ -187,13 +191,20 @@ def image_creator():
                                  "(use --force to overwrite it)." % filename)
 
     disk = Disk(options.source, out)
+
+    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)