From 5312a9611b61801d4a62d1959e65cf8d50c38eb1 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 2 Jul 2019 15:39:51 -0400
Subject: [PATCH] virt-install: Revive --wait 0 as alias for --noautoconsole

This was the behavior prior to last release, and we received
a bug report about it. Revive it, but warn about the recommended way
to do it

https://bugzilla.redhat.com/show_bug.cgi?id=1724287
---
 tests/clitest.py | 2 +-
 virt-install     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/clitest.py b/tests/clitest.py
index f0f0295f..a4addb8c 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -851,10 +851,10 @@ c.add_valid("--hvm --install no_install=yes")  # import install equivalent
 c.add_valid("--hvm --import --prompt --force")  # Working scenario w/ prompt shouldn't ask anything
 c.add_valid("--paravirt --import")  # PV Import install
 c.add_valid("--paravirt --print-xml 1")  # print single XML, implied import install
+c.add_valid("--hvm --import --wait 0", grep="Treating --wait 0 as --noautoconsole")  # --wait 0 is the same as --noautoconsole
 c.add_compare("-c %(EXISTIMG2)s --os-variant win2k3 --vcpus cores=4 --controller usb,model=none", "w2k3-cdrom")  # HVM windows install with disk
 c.add_compare("--connect %(URI-KVM)s --install fedora26 --disk size=20", "osinfo-url-with-disk")  # filling in defaults, but with disk specified
 c.add_invalid("--hvm --import --wait 2", grep="exceeded specified time limit")  # --wait positive number, but test suite hack
-c.add_invalid("--hvm --import --wait 0", grep="exceeded specified time limit")  # --wait 0, but test suite hack
 c.add_invalid("--hvm --import --wait -1", grep="exceeded specified time limit")  # --wait -1, but test suite hack
 c.add_invalid("--hvm --import --wait", grep="exceeded specified time limit")  # --wait aka --wait -1, but test suite hack
 c.add_invalid("--connect test:///default --name foo --ram 64 --disk none --sdl --hvm --import", use_default_args=False, grep="exceeded specified time limit")  # --sdl doesn't have a console callback, triggers implicit --wait -1
diff --git a/virt-install b/virt-install
index ee2b9006..af6c75bf 100755
--- a/virt-install
+++ b/virt-install
@@ -258,6 +258,14 @@ def convert_old_features(options):
         options.features = [",".join(opts)]
 
 
+def convert_wait_zero(options):
+    # Historical back compat, --wait 0 is identical to --noautoconsole
+    if options.wait == 0:
+        log.warning("Treating --wait 0 as --noautoconsole")
+        options.autoconsole = False
+        options.wait = None
+
+
 ##################################
 # Install media setup/validation #
 ##################################
@@ -972,6 +980,7 @@ def main(conn=None):
     convert_old_features(options)
     convert_old_cpuset(options)
     convert_old_init(options)
+    convert_wait_zero(options)
     set_test_stub_options(options)
     convert_old_os_options(options)