Add support for overwriting yes/no button labels
[snf-image-creator] / image_creator / dialog_main.py
index 5f8b52b..2a6463e 100644 (file)
@@ -39,14 +39,19 @@ import os
 import textwrap
 import signal
 import StringIO
+import optparse
 
 from image_creator import __version__ as version
 from image_creator.util import FatalError, MD5
+from image_creator.output import Output
+from image_creator.output.cli import SimpleOutput
 from image_creator.output.dialog import GaugeOutput, InfoBoxOutput
+from image_creator.output.composite import CompositeOutput
 from image_creator.disk import Disk
 from image_creator.os_type import os_cls
 from image_creator.kamaki_wrapper import Kamaki, ClientError
 from image_creator.help import get_help_file
+from image_creator.dialog_wizard import wizard
 
 MSGBOX_WIDTH = 60
 YESNO_WIDTH = 50
@@ -57,20 +62,20 @@ HELP_WIDTH = 70
 INFOBOX_WIDTH = 70
 
 CONFIGURATION_TASKS = [
- ("Partition table manipulation", ["FixPartitionTable"],
-  ["linux", "windows"]),
- ("File system resize",
-  ["FilesystemResizeUnmounted", "FilesystemResizeMounted"],
-  ["linux", "windows"]),
- ("Swap partition configuration", ["AddSwap"], ["linux"]),
- ("SSH keys removal", ["DeleteSSHKeys"], ["linux"]),
- ("Temporal RDP disabling", ["DisableRemoteDesktopConnections"], ["windows"]),
- ("SELinux relabeling at next boot", ["SELinuxAutorelabel"],
-  ["linux"]),
- ("Hostname/Computer Name assignment", ["AssignHostname"],
-  ["windows", "linux"]),
- ("Password change", ["ChangePassword"], ["windows", "linux"]),
- ("File injection", ["EnforcePersonality"], ["windows", "linux"])
+    ("Partition table manipulation", ["FixPartitionTable"],
+        ["linux", "windows"]),
+    ("File system resize",
+        ["FilesystemResizeUnmounted", "FilesystemResizeMounted"],
+        ["linux", "windows"]),
+    ("Swap partition configuration", ["AddSwap"], ["linux"]),
+    ("SSH keys removal", ["DeleteSSHKeys"], ["linux"]),
+    ("Temporal RDP disabling", ["DisableRemoteDesktopConnections"],
+        ["windows"]),
+    ("SELinux relabeling at next boot", ["SELinuxAutorelabel"], ["linux"]),
+    ("Hostname/Computer Name assignment", ["AssignHostname"],
+        ["windows", "linux"]),
+    ("Password change", ["ChangePassword"], ["windows", "linux"]),
+    ("File injection", ["EnforcePersonality"], ["windows", "linux"])
 ]
 
 
@@ -78,13 +83,64 @@ class Reset(Exception):
     pass
 
 
+class metadata_monitor(object):
+    def __init__(self, session, meta):
+        self.session = session
+        self.meta = meta
+
+    def __enter__(self):
+        self.old = {}
+        for (k, v) in self.meta.items():
+            self.old[k] = v
+
+    def __exit__(self, type, value, traceback):
+        d = self.session['dialog']
+
+        altered = {}
+        added = {}
+
+        for (k, v) in self.meta.items():
+            if k not in self.old:
+                added[k] = v
+            elif self.old[k] != v:
+                altered[k] = v
+
+        if not (len(added) or len(altered)):
+            return
+
+        msg = "The last action has changed some image properties:\n\n"
+        if len(added):
+            msg += "New image properties:\n"
+            for (k, v) in added.items():
+                msg += '    %s: "%s"\n' % (k, v)
+            msg += "\n"
+        if len(altered):
+            msg += "Updated image properties:\n"
+            for (k, v) in altered.items():
+                msg += '    %s: "%s" -> "%s"\n' % (k, self.old[k], v)
+            msg += "\n"
+
+        self.session['metadata'].update(added)
+        self.session['metadata'].update(altered)
+        d.msgbox(msg, title="Image Property Changes", width=MSGBOX_WIDTH)
+
+
+def extract_metadata_string(session):
+    metadata = ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()]
+
+    if 'task_metadata' in session:
+        metadata.extend("%s=yes" % m for m in session['task_metadata'])
+
+    return '\n'.join(metadata) + '\n'
+
+
 def confirm_exit(d, msg=''):
     return not d.yesno("%s Do you want to exit?" % msg, width=YESNO_WIDTH)
 
 
 def confirm_reset(d):
     return not d.yesno("Are you sure you want to reset everything?",
-                       width=YESNO_WIDTH)
+                       width=YESNO_WIDTH, defaultno=1)
 
 
 def update_background_title(session):
@@ -93,8 +149,8 @@ def update_background_title(session):
 
     MB = 2 ** 20
 
-    size = (dev.meta['SIZE'] + MB - 1) // MB
-    shrinked = 'shrinked' in session and session['shrinked'] == True
+    size = (dev.size + MB - 1) // MB
+    shrinked = 'shrinked' in session and session['shrinked']
     postfix = " (shrinked)" if shrinked else ''
 
     title = "OS: %s, Distro: %s, Size: %dMB%s" % \
@@ -144,40 +200,41 @@ def extract_image(session):
 
         if len(overwrite) > 0:
             if d.yesno("The following file(s) exist:\n"
-                        "%s\nDo you want to overwrite them?" %
-                        "\n".join(overwrite), width=YESNO_WIDTH):
+                       "%s\nDo you want to overwrite them?" %
+                       "\n".join(overwrite), width=YESNO_WIDTH):
                 continue
 
-        out = GaugeOutput(d, "Image Extraction", "Extracting image...")
+        gauge = GaugeOutput(d, "Image Extraction", "Extracting image...")
         try:
             dev = session['device']
-            if "checksum" not in session:
-                size = dev.meta['SIZE']
-                md5 = MD5(out)
-                session['checksum'] = md5.compute(session['snapshot'], size)
-
-            # Extract image file
-            dev.out = out
-            dev.dump(path)
-
-            # Extract metadata file
-            out.output("Extracting metadata file...")
-            metastring = '\n'.join(
-                ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()])
-            metastring += '\n'
-            with open('%s.meta' % path, 'w') as f:
-                f.write(metastring)
-            out.success('done')
-
-            # Extract md5sum file
-            out.output("Extracting md5sum file...")
-            md5str = "%s %s\n" % (session['checksum'], name)
-            with open('%s.md5sum' % path, 'w') as f:
-                f.write(md5str)
-            out.success("done")
-
+            out = dev.out
+            out.add(gauge)
+            try:
+                if "checksum" not in session:
+                    size = dev.size
+                    md5 = MD5(out)
+                    session['checksum'] = md5.compute(session['snapshot'],
+                                                      size)
+
+                # Extract image file
+                dev.dump(path)
+
+                # Extract metadata file
+                out.output("Extracting metadata file...")
+                with open('%s.meta' % path, 'w') as f:
+                    f.write(extract_metadata_string(session))
+                out.success('done')
+
+                # Extract md5sum file
+                out.output("Extracting md5sum file...")
+                md5str = "%s %s\n" % (session['checksum'], name)
+                with open('%s.md5sum' % path, 'w') as f:
+                    f.write(md5str)
+                out.success("done")
+            finally:
+                out.remove(gauge)
         finally:
-            out.cleanup()
+            gauge.cleanup()
         d.msgbox("Image file `%s' was successfully extracted!" % path,
                  width=MSGBOX_WIDTH)
         break
@@ -187,7 +244,8 @@ def extract_image(session):
 
 def upload_image(session):
     d = session["dialog"]
-    size = session['device'].meta['SIZE']
+    dev = session['device']
+    size = dev.size
 
     if "account" not in session:
         d.msgbox("You need to provide your ~okeanos login username before you "
@@ -215,42 +273,47 @@ def upload_image(session):
 
         break
 
-    out = GaugeOutput(d, "Image Upload", "Uploading...")
-    if 'checksum' not in session:
-        md5 = MD5(out)
-        session['checksum'] = md5.compute(session['snapshot'], size)
+    gauge = GaugeOutput(d, "Image Upload", "Uploading...")
     try:
-        kamaki = Kamaki(session['account'], session['token'], out)
+        out = dev.out
+        out.add(gauge)
         try:
-            # Upload image file
-            with open(session['snapshot'], 'rb') as f:
-                session["upload"] = kamaki.upload(f, size, filename,
-                                                  "Calculating block hashes",
-                                                  "Uploading missing blocks")
-            # Upload metadata file
-            out.output("Uploading metadata file...")
-            metastring = '\n'.join(
-                ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()])
-            metastring += '\n'
-            kamaki.upload(StringIO.StringIO(metastring), size=len(metastring),
-                          remote_path="%s.meta" % filename)
-            out.success("done")
-
-            # Upload md5sum file
-            out.output("Uploading md5sum file...")
-            md5str = "%s %s\n" % (session['checksum'], filename)
-            kamaki.upload(StringIO.StringIO(md5str), size=len(md5str),
-                          remote_path="%s.md5sum" % filename)
-            out.success("done")
-
-        except ClientError as e:
-            d.msgbox("Error in pithos+ client: %s" % e.message,
-                     title="Pithos+ Client Error", width=MSGBOX_WIDTH)
-            if 'upload' in session:
-                del session['upload']
-            return False
+            if 'checksum' not in session:
+                md5 = MD5(out)
+                session['checksum'] = md5.compute(session['snapshot'], size)
+
+            kamaki = Kamaki(session['account'], session['token'], out)
+            try:
+                # Upload image file
+                with open(session['snapshot'], 'rb') as f:
+                    session["upload"] = kamaki.upload(f, size, filename,
+                                                    "Calculating block hashes",
+                                                    "Uploading missing blocks")
+                # Upload metadata file
+                out.output("Uploading metadata file...")
+                metastring = extract_metadata_string(session)
+                kamaki.upload(StringIO.StringIO(metastring),
+                              size=len(metastring),
+                              remote_path="%s.meta" % filename)
+                out.success("done")
+
+                # Upload md5sum file
+                out.output("Uploading md5sum file...")
+                md5str = "%s %s\n" % (session['checksum'], filename)
+                kamaki.upload(StringIO.StringIO(md5str), size=len(md5str),
+                              remote_path="%s.md5sum" % filename)
+                out.success("done")
+
+            except ClientError as e:
+                d.msgbox("Error in pithos+ client: %s" % e.message,
+                         title="Pithos+ Client Error", width=MSGBOX_WIDTH)
+                if 'upload' in session:
+                    del session['upload']
+                return False
+        finally:
+            out.remove(gauge)
     finally:
-        out.cleanup()
+        gauge.cleanup()
 
     d.msgbox("Image file `%s' was successfully uploaded to pithos+" % filename,
              width=MSGBOX_WIDTH)
@@ -260,6 +323,7 @@ def upload_image(session):
 
 def register_image(session):
     d = session["dialog"]
+    dev = session['device']
 
     if "account" not in session:
         d.msgbox("You need to provide your ~okeanos login username before you "
@@ -274,14 +338,13 @@ def register_image(session):
         return False
 
     if "upload" not in session:
-        d.msgbox("You need to have an image uploaded to pithos+ before you "
-                 "can register it to cyclades",
-                 width=MSGBOX_WIDTH)
+        d.msgbox("You need to upload the image to pithos+ before you can "
+                 "register it to cyclades", width=MSGBOX_WIDTH)
         return False
 
     while 1:
-        (code, answer) = d.inputbox("Please provide a registration name:"
-                                " be registered:", width=INPUTBOX_WIDTH)
+        (code, answer) = d.inputbox("Please provide a registration name:",
+                                    width=INPUTBOX_WIDTH)
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
 
@@ -291,18 +354,29 @@ def register_image(session):
             continue
         break
 
-    out = GaugeOutput(d, "Image Registration", "Registrating image...")
+    metadata = {}
+    metadata.update(session['metadata'])
+    if 'task_metadata' in session:
+        for key in session['task_metadata']:
+            metadata[key] = 'yes'
+
+    gauge = GaugeOutput(d, "Image Registration", "Registrating image...")
     try:
-        out.output("Registring image to cyclades...")
+        out = dev.out
+        out.add(gauge)
         try:
-            kamaki = Kamaki(session['account'], session['token'], out)
-            kamaki.register(name, session['upload'], session['metadata'])
-            out.success('done')
-        except ClientError as e:
-            d.msgbox("Error in pithos+ client: %s" % e.message)
-            return False
+            out.output("Registring image to cyclades...")
+            try:
+                kamaki = Kamaki(session['account'], session['token'], out)
+                kamaki.register(name, session['upload'], metadata)
+                out.success('done')
+            except ClientError as e:
+                d.msgbox("Error in pithos+ client: %s" % e.message)
+                return False
+        finally:
+            out.remove(gauge)
     finally:
-        out.cleanup()
+        gauge.cleanup()
 
     d.msgbox("Image `%s' was successfully registered to cyclades as `%s'" %
              (session['upload'], name), width=MSGBOX_WIDTH)
@@ -312,6 +386,15 @@ def register_image(session):
 def kamaki_menu(session):
     d = session['dialog']
     default_item = "Account"
+
+    account = Kamaki.get_account()
+    if account:
+        session['account'] = account
+
+    token = Kamaki.get_token()
+    if token:
+        session['token'] = token
+
     while 1:
         account = session["account"] if "account" in session else "<none>"
         token = session["token"] if "token" in session else "<none>"
@@ -320,12 +403,13 @@ def kamaki_menu(session):
         choices = [("Account", "Change your ~okeanos username: %s" % account),
                    ("Token", "Change your ~okeanos token: %s" % token),
                    ("Upload", "Upload image to pithos+"),
-                   ("Register", "Register image to cyclades: %s" % upload)]
+                   ("Register", "Register the image to cyclades: %s" % upload)]
 
         (code, choice) = d.menu(
             text="Choose one of the following or press <Back> to go back.",
-            width=MENU_WIDTH, choices=choices, cancel="Back", help_button=1,
-            default_item=default_item, title="Image Registration Menu")
+            width=MENU_WIDTH, choices=choices, cancel="Back", height=13,
+            menu_height=5, default_item=default_item,
+            title="Image Registration Menu")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
@@ -342,6 +426,7 @@ def kamaki_menu(session):
                     del session["account"]
             else:
                 session["account"] = answer.strip()
+                Kamaki.save_account(session['account'])
                 default_item = "Token"
         elif choice == "Token":
             default_item = "Token"
@@ -355,6 +440,7 @@ def kamaki_menu(session):
                 del session["token"]
             else:
                 session["token"] = answer.strip()
+                Kamaki.save_token(session['account'])
                 default_item = "Upload"
         elif choice == "Upload":
             if upload_image(session):
@@ -386,7 +472,7 @@ def add_property(session):
 
     while 1:
         (code, answer) = d.inputbox("Please provide a value for image "
-                                   "property %s" % name, width=INPUTBOX_WIDTH)
+                                    "property %s" % name, width=INPUTBOX_WIDTH)
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
 
@@ -417,15 +503,17 @@ def modify_properties(session):
             "information about image properties. Press <BACK> when done.",
             height=18, width=MENU_WIDTH, choices=choices, menu_height=10,
             ok_label="Edit", extra_button=1, extra_label="Add", cancel="Back",
-            help_button=1, title="Image Metadata")
+            help_button=1, title="Image Properties")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            break
+            return True
         # Edit button
         elif code == d.DIALOG_OK:
-            (code, answer) = d.inputbox("Please provide a new value for "
-                    "the image property with name `%s':" % choice,
-                    init=session['metadata'][choice], width=INPUTBOX_WIDTH)
+            (code, answer) = d.inputbox("Please provide a new value for the "
+                                        "image property with name `%s':" %
+                                        choice,
+                                        init=session['metadata'][choice],
+                                        width=INPUTBOX_WIDTH)
             if code not in (d.DIALOG_CANCEL, d.DIALOG_ESC):
                 value = answer.strip()
                 if len(value) == 0:
@@ -436,6 +524,10 @@ def modify_properties(session):
         # ADD button
         elif code == d.DIALOG_EXTRA:
             add_property(session)
+        elif code == 'help':
+            help_file = get_help_file("image_properties")
+            assert os.path.exists(help_file)
+            d.textbox(help_file, title="Image Properties", width=70, height=40)
 
 
 def delete_properties(session):
@@ -455,6 +547,9 @@ def delete_properties(session):
     cnt = len(to_delete)
     if cnt > 0:
         d.msgbox("%d image properties were deleted." % cnt, width=MSGBOX_WIDTH)
+        return True
+    else:
+        return False
 
 
 def exclude_tasks(session):
@@ -472,7 +567,7 @@ def exclude_tasks(session):
                        "Do you wish to enable it?", width=YESNO_WIDTH):
             session['excluded_tasks'].remove(-1)
         else:
-            return
+            return False
 
     for (msg, task, osfamily) in CONFIGURATION_TASKS:
         if session['metadata']['OSFAMILY'] in osfamily:
@@ -494,7 +589,7 @@ def exclude_tasks(session):
             title="Exclude Configuration Tasks")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            break
+            return False
         elif code == d.DIALOG_HELP:
             help_file = get_help_file("configuration_tasks")
             assert os.path.exists(help_file)
@@ -514,17 +609,19 @@ def exclude_tasks(session):
             for task in session['excluded_tasks']:
                 exclude_metadata.extend(CONFIGURATION_TASKS[task][1])
 
-            session['task_metadata'] = \
-                        map(lambda x: "EXCLUDE_TASK_%s" % x, exclude_metadata)
+            session['task_metadata'] = map(lambda x: "EXCLUDE_TASK_%s" % x,
+                                           exclude_metadata)
             break
 
+    return True
+
 
 def sysprep(session):
     d = session['dialog']
     image_os = session['image_os']
 
     # Is the image already shrinked?
-    if 'shrinked' in session and session['shrinked'] == True:
+    if 'shrinked' in session and session['shrinked']:
         msg = "It seems you have shrinked the image. Running system " \
               "preparation tasks on a shrinked image is dangerous."
 
@@ -545,7 +642,8 @@ def sysprep(session):
     syspreps = [s for s in all_syspreps if s not in session['exec_syspreps']]
 
     if len(syspreps) == 0:
-        d.msgbox("No system preparation task left to run!", width=MSGBOX_WIDTH)
+        d.msgbox("No system preparation task available to run!",
+                 title="System Preperation", width=MSGBOX_WIDTH)
         return
 
     while 1:
@@ -568,7 +666,7 @@ def sysprep(session):
             choices=choices, width=70, ok_label="Run", help_button=1)
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            break
+            return False
         elif code == d.DIALOG_HELP:
             d.scrollbox(sysprep_help, width=HELP_WIDTH)
         elif code == d.DIALOG_OK:
@@ -580,43 +678,45 @@ def sysprep(session):
                 else:
                     image_os.disable_sysprep(syspreps[i])
 
-            out = InfoBoxOutput(d, "Image Configuration")
+            infobox = InfoBoxOutput(d, "Image Configuration")
             try:
                 dev = session['device']
-                dev.out = out
-                dev.mount(readonly=False)
+                dev.out.add(infobox)
                 try:
-                    # The checksum is invalid. We have mounted the image rw
-                    if 'checksum' in session:
-                        del session['checksum']
-
-                    image_os.out = out
-                    image_os.do_sysprep()
-
-                    for (k, v) in image_os.meta.items():
-                        session['metadata'][str(k)] = str(v)
-
-                    # Disable syspreps that have ran
-                    for sysprep in session['exec_syspreps']:
-                        image_os.disable_sysprep(sysprep)
-
-                    image_os.out.finalize()
+                    dev.mount(readonly=False)
+                    try:
+                        # The checksum is invalid. We have mounted the image rw
+                        if 'checksum' in session:
+                            del session['checksum']
+
+                        # Monitor the metadata changes during syspreps
+                        with metadata_monitor(session, image_os.meta):
+                            image_os.do_sysprep()
+                            infobox.finalize()
+
+                        # Disable syspreps that have ran
+                        for sysprep in session['exec_syspreps']:
+                            image_os.disable_sysprep(sysprep)
+                    finally:
+                        dev.umount()
                 finally:
-                    dev.umount()
+                    dev.out.remove(infobox)
             finally:
-                out.cleanup()
+                infobox.cleanup()
             break
+    return True
 
 
 def shrink(session):
     d = session['dialog']
     dev = session['device']
 
-    shrinked = 'shrinked' in session and session['shrinked'] == True
+    shrinked = 'shrinked' in session and session['shrinked']
 
     if shrinked:
-        d.msgbox("You have already shrinked your image!")
-        return
+        d.msgbox("The image is already shrinked!", title="Image Shrinking",
+                 width=MSGBOX_WIDTH)
+        return True
 
     msg = "This operation will shrink the last partition of the image to " \
           "reduce the total image size. If the last partition is a swap " \
@@ -626,11 +726,21 @@ def shrink(session):
 
     if not d.yesno("%s\n\nDo you want to continue?" % msg, width=70,
                    height=12, title="Image Shrinking"):
-        dev.out = InfoBoxOutput(d, "Image Shrinking", height=3)
-        session['metadata']['SIZE'] = str(dev.shrink())
+        with metadata_monitor(session, dev.meta):
+            infobox = InfoBoxOutput(d, "Image Shrinking", height=4)
+            dev.out.add(infobox)
+            try:
+                dev.shrink()
+                infobox.finalize()
+            finally:
+                dev.out.remove(infobox)
+
         session['shrinked'] = True
         update_background_title(session)
-        dev.out.finalize()
+    else:
+        return False
+
+    return True
 
 
 def customization_menu(session):
@@ -642,7 +752,7 @@ def customization_menu(session):
                ("Delete", "Delete image properties"),
                ("Exclude", "Exclude various deployment tasks from running")]
 
-    default_item = "Sysprep"
+    default_item = 0
 
     actions = {"Sysprep": sysprep,
                "Shrink": shrink,
@@ -653,14 +763,15 @@ def customization_menu(session):
         (code, choice) = d.menu(
             text="Choose one of the following or press <Back> to exit.",
             width=MENU_WIDTH, choices=choices, cancel="Back", height=13,
-            menu_height=len(choices), default_item=default_item,
+            menu_height=len(choices), default_item=choices[default_item][0],
             title="Image Customization Menu")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             break
         elif choice in actions:
-            default_item = choice
-            actions[choice](session)
+            default_item = [entry[0] for entry in choices].index(choice)
+            if actions[choice](session):
+                default_item = (default_item + 1) % len(choices)
 
 
 def main_menu(session):
@@ -699,47 +810,16 @@ def main_menu(session):
             actions[choice](session)
 
 
-def select_file(d, media):
-    root = os.sep
-    while 1:
-        if media is not None:
-            if not os.path.exists(media):
-                d.msgbox("The file you choose does not exist",
-                         width=MSGBOX_WIDTH)
-            else:
-                break
-
-        (code, media) = d.fselect(root, 10, 50,
-                                 title="Please select input media")
-        if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            if confirm_exit(d, "You canceled the media selection dialog box."):
-                sys.exit(0)
-            else:
-                media = None
-                continue
-
-    return media
-
-
-def image_creator(d):
-    basename = os.path.basename(sys.argv[0])
-    usage = "Usage: %s [input_media]" % basename
-    if len(sys.argv) > 2:
-        sys.stderr.write("%s\n" % usage)
-        return 1
+def image_creator(d, media, out):
 
     d.setBackgroundTitle('snf-image-creator')
 
-    if os.geteuid() != 0:
-        raise FatalError("You must run %s as root" % basename)
-
-    media = select_file(d, sys.argv[1] if len(sys.argv) == 2 else None)
-
-    out = GaugeOutput(d, "Initialization", "Initializing...")
+    gauge = GaugeOutput(d, "Initialization", "Initializing...")
+    out.add(gauge)
     disk = Disk(media, out)
 
     def signal_handler(signum, frame):
-        out.cleanup()
+        gauge.cleanup()
         disk.cleanup()
 
     signal.signal(signal.SIGINT, signal_handler)
@@ -747,13 +827,12 @@ def image_creator(d):
         snapshot = disk.snapshot()
         dev = disk.get_device(snapshot)
 
-        out.output("Collecting image metadata...")
-
         metadata = {}
         for (key, value) in dev.meta.items():
             metadata[str(key)] = str(value)
 
         dev.mount(readonly=True)
+        out.output("Collecting image metadata...")
         cls = os_cls(dev.distro, dev.ostype)
         image_os = cls(dev.root, dev.g, out)
         dev.umount()
@@ -762,12 +841,13 @@ def image_creator(d):
             metadata[str(key)] = str(value)
 
         out.success("done")
-        out.cleanup()
+        gauge.cleanup()
+        out.remove(gauge)
 
-        # Make sure the signal handler does not call out.cleanup again
+        # Make sure the signal handler does not call gauge.cleanup again
         def dummy(self):
             pass
-        out.cleanup = type(GaugeOutput.cleanup)(dummy, out, GaugeOutput)
+        gauge.cleanup = type(GaugeOutput.cleanup)(dummy, gauge, GaugeOutput)
 
         session = {"dialog": d,
                    "disk": disk,
@@ -776,7 +856,29 @@ def image_creator(d):
                    "image_os": image_os,
                    "metadata": metadata}
 
-        main_menu(session)
+        msg = "snf-image-creator detected a %s system on the input media. " \
+              "Would you like to run a wizard to assist you through the " \
+              "image creation process?\n\nChoose <Wizard> to run the wizard," \
+              " <Expert> to run the snf-image-creator in expert mode or press " \
+              "ESC to quit the program." \
+              % (dev.ostype if dev.ostype == dev.distro else "%s (%s)" %
+                 (dev.ostype, dev.distro))
+
+        update_background_title(session)
+
+        while True:
+            code = d.yesno(msg, width=YESNO_WIDTH, height=12,
+                           yes_label="Wizard", no_label="Expert")
+            if code == d.DIALOG_OK:
+                if wizard(session):
+                    break
+            elif code == d.DIALOG_CANCEL:
+                main_menu(session)
+                break
+
+            if confirm_exit(d):
+                break
+
         d.infobox("Thank you for using snf-image-creator. Bye", width=53)
     finally:
         disk.cleanup()
@@ -784,6 +886,28 @@ def image_creator(d):
     return 0
 
 
+def select_file(d, media):
+    root = os.sep
+    while 1:
+        if media is not None:
+            if not os.path.exists(media):
+                d.msgbox("The file `%s' you choose does not exist." % media,
+                         width=MSGBOX_WIDTH)
+            else:
+                break
+
+        (code, media) = d.fselect(root, 10, 50,
+                                  title="Please select input media")
+        if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
+            if confirm_exit(d, "You canceled the media selection dialog box."):
+                sys.exit(0)
+            else:
+                media = None
+                continue
+
+    return media
+
+
 def main():
 
     d = dialog.Dialog(dialog="dialog")
@@ -795,16 +919,60 @@ def main():
     dialog._common_args_syntax["extra_label"] = \
         lambda string: ("--extra-label", string)
 
-    while 1:
-        try:
+    # Allow yes-no label overwriting
+    dialog._common_args_syntax["yes_label"] = \
+        lambda string: ("--yes-label", string)
+
+    dialog._common_args_syntax["no_label"] = \
+        lambda string: ("--no-label", string)
+
+    usage = "Usage: %prog [options] [<input_media>]"
+    parser = optparse.OptionParser(version=version, usage=usage)
+    parser.add_option("-l", "--logfile", type="string", dest="logfile",
+                      default=None, help="log all messages to FILE",
+                      metavar="FILE")
+
+    options, args = parser.parse_args(sys.argv[1:])
+
+    if len(args) > 1:
+        parser.error("Wrong number of arguments")
+
+    d.setBackgroundTitle('snf-image-creator')
+
+    try:
+        if os.geteuid() != 0:
+            raise FatalError("You must run %s as root" % \
+                             parser.get_prog_name())
+
+        media = select_file(d, args[0] if len(args) == 1 else None)
+
+        logfile = None
+        if options.logfile is not None:
             try:
-                ret = image_creator(d)
-                sys.exit(ret)
-            except FatalError as e:
-                msg = textwrap.fill(str(e), width=70)
-                d.infobox(msg, width=INFOBOX_WIDTH, title="Fatal Error")
-                sys.exit(1)
-        except Reset:
-            continue
+                logfile = open(options.logfile, 'w')
+            except IOError as e:
+                raise FatalError(
+                    "Unable to open logfile `%s' for writing. Reason: %s" % \
+                    (options.logfile, e.strerror))
+        try:
+            log = SimpleOutput(False, logfile) if logfile is not None \
+                                               else Output()
+            while 1:
+                try:
+                    out = CompositeOutput([log])
+                    out.output("Starting %s version %s..." % \
+                               (parser.get_prog_name(), version))
+                    ret = image_creator(d, media, out)
+                    sys.exit(ret)
+                except Reset:
+                    log.output("Resetting everything...")
+                    continue
+        finally:
+            if logfile is not None:
+                logfile.close()
+    except FatalError as e:
+        msg = textwrap.fill(str(e), width=70)
+        d.infobox(msg, width=INFOBOX_WIDTH, title="Fatal Error")
+        sys.exit(1)
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :