Add a --no-snapshot option

This can be used to act on the original media instead of a device-mapper
snapshot.

This resolves #10

image_creator/dialog_main.py

@@ -46,7 +46,7 @@ from image_creator.dialog_util import WIDTH, confirm_exit, Reset, \
 PROGNAME = os.path.basename(sys.argv[0])
 
 
-def create_image(d, media, out, tmp):
+def create_image(d, media, out, tmp, snapshot):
     """Create an image out of `media'"""
     d.setBackgroundTitle('snf-image-creator')
 
@@ -61,9 +61,8 @@ def create_image(d, media, out, tmp):
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
     try:
-        # There is no need to snapshot the media if it was created by the Disk
-        # instance as a temporary object.
-        device = disk.file if disk.source == '/' else disk.snapshot()
+
+        device = disk.file if not snapshot else disk.snapshot()
 
         image = disk.get_image(device)
 
@@ -172,7 +171,7 @@ def _dialog_form(self, text, height=20, width=60, form_height=15, fields=[],
     return (code, output.splitlines())
 
 
-def dialog_main(media, logfile, tmpdir):
+def dialog_main(media, logfile, tmpdir, snapshot):
 
     # In openSUSE dialog is buggy under xterm
     if os.environ['TERM'] == 'xterm':
@@ -214,7 +213,7 @@ def dialog_main(media, logfile, tmpdir):
             try:
                 out = CompositeOutput([log])
                 out.output("Starting %s v%s ..." % (PROGNAME, version))
-                return create_image(d, media, out, tmpdir)
+                return create_image(d, media, out, tmpdir, snapshot)
             except Reset:
                 log.output("Resetting everything ...")
                 continue
@@ -235,6 +234,10 @@ def main():
     parser.add_option("-l", "--logfile", type="string", dest="logfile",
                       default=None, help="log all messages to FILE",
                       metavar="FILE")
+    parser.add_option("--no-snapshot", dest="snapshot", default=True,
+                      help="don't snapshot the input media. (THIS IS "
+                      "DANGEROUS AS IT WILL ALTER THE ORIGINAL MEDIA!!!)",
+                      action="store_false")
     parser.add_option("--tmpdir", type="string", dest="tmp", default=None,
                       help="create large temporary image files under DIR",
                       metavar="DIR")
@@ -260,7 +263,7 @@ def main():
         # Save the terminal attributes
         attr = termios.tcgetattr(sys.stdin.fileno())
         try:
-            ret = dialog_main(media, logfile, opts.tmp)
+            ret = dialog_main(media, logfile, opts.tmp, opts.snapshot)
         finally:
             # Restore the terminal attributes. If an error occurs make sure
             # that the terminal turns back to normal.

image_creator/disk.py

@@ -153,6 +153,11 @@ class Disk(object):
         """Creates a snapshot of the original source media of the Disk
         instance.
         """
+
+        if self.source == '/':
+            self.out.warn("Snapshotting ignored for host bundling mode.")
+            return self.file
+
         mode = os.stat(self.file).st_mode
         device = self.file if stat.S_ISBLK(mode) else self._losetup(self.file)
         size = blockdev('--getsz', device)

image_creator/main.py

@@ -120,6 +120,11 @@ def parse_options(input_args):
                       help="don't perform any system preparation operation",
                       action="store_false")
 
+    parser.add_option("--no-snapshot", dest="snapshot", default=True,
+                      help="don't snapshot the input media. (THIS IS "
+                      "DANGEROUS AS IT WILL ALTER THE ORIGINAL MEDIA!!!)",
+                      action="store_false")
+
     parser.add_option("--public", dest="public", default=False,
                       help="register image with the cloud as public",
                       action="store_true")
@@ -263,7 +268,7 @@ def image_creator():
     try:
         # There is no need to snapshot the media if it was created by the Disk
         # instance as a temporary object.
-        device = disk.file if disk.source == '/' else disk.snapshot()
+        device = disk.file if not options.snapshot else disk.snapshot()
         image = disk.get_image(device, sysprep_params=options.sysprep_params)
 
         if image.is_unsupported() and not options.allow_unsupported: