[et-mgmt-tools] [PATCH] Default --wait to 120 minutes for Windows

[john.levon at sun.com]

# HG changeset patch
# User john.levon at sun.com
# Date 1233861322 28800
# Node ID e72836e9f581e0761ba9ed3253397b1b51affc7e
# Parent  7c38f808054c83211e428178baa4dda597815ba0
Default --wait to 120 minutes for Windows

If we're installing a Windows guest, it will reboot during the
installation. Default to waiting in this case so virt-install is still
around to manage the reboot.

Signed-off-by: John Levon <john.levon at sun.com>

diff --git a/virt-install b/virt-install
--- a/virt-install
+++ b/virt-install
@@ -620,18 +620,26 @@ def main():
         else:
             return txt_console(dom, options.connect)
 
-    wait = False
-    wait_time = 0
+    # There are two main cases we care about:
+    #
+    # Scripts: these should specify --wait always, maintaining the
+    # semantics of virt-install exit implying the domain has finished
+    # installing.
+    #
+    # Interactive: If this is a continue_inst domain, we default to
+    # waiting.  Otherwise, we can exit before the domain has finished
+    # installing. Passing --wait will give the above semantics.
+    # 
+    wait = continue_inst
+    wait_time = 120 * 60
+
     if options.wait:
         wait = True
         wait_time = options.wait * 60
 
-    if wait is True and wait_time == 0:
-        # wait == 0 implies noautoconsole
-        options.autoconsole = False
-
     if options.autoconsole is False:
         conscb = None
+        wait = False
     else:
         conscb = show_console
 
@@ -678,7 +686,7 @@ def main():
                             ((wait_time > 0)
                              and (_(" %d minutes") % (int(wait_time) / 60))
                              or "") + \
-                            " for domain to shutdown.")
+                            " for domain to complete installation.")
                     while True:
                         if domain_is_shutdown(dom):
                             print _("Domain has shutdown. Continuing.")