diff options
-rw-r--r-- | tests/clitest.py | 1 | ||||
-rwxr-xr-x | virt-install | 19 |
2 files changed, 2 insertions, 18 deletions
diff --git a/tests/clitest.py b/tests/clitest.py index 6ee7fc42..03d6d52f 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -1099,7 +1099,6 @@ c.add_valid("--pxe --destroy-on-exit", grep="Restarting guest.\n") # destroy-on c.add_valid("--pxe --transient --destroy-on-exit", grep="Domain creation completed.") # destroy-on-exit + transient c.add_valid("--pxe --graphics vnc --noreboot", grep="testsuite console command: ['virt-viewer'") # mock virt-viewer waiting, with noreboot magic c.add_valid("--nographics --cdrom %(EXISTIMG1)s") # console warning about cdrom + nographics -c.add_valid("--nographics --console none --location %(TREEDIR)s", grep="No --console device added") # console warning about nographics + --console none c.add_valid("--nographics --console none --location %(TREEDIR)s", grep="Directory tree installs typically") # warning about directory trees not working well c.add_valid("--pxe --nographics --transient", grep="testsuite console command: ['virsh'") # --transient handling diff --git a/virt-install b/virt-install index 2a6f58c7..f569c46a 100755 --- a/virt-install +++ b/virt-install @@ -319,10 +319,6 @@ def validate_required_options(options, guest, installer): fail(msg) -_cdrom_location_man_page = _("See the man page for examples of " - "using --location with CDROM media") - - def _show_nographics_warnings(options, guest, installer): if guest.devices.graphics: return @@ -333,19 +329,8 @@ def _show_nographics_warnings(options, guest, installer): log.warning(_("CDROM media does not print to the text console " "by default, so you likely will not see text install output. " "You might want to use --location.") + " " + - _cdrom_location_man_page) - return - - if not options.location: - return - - # Trying --location --nographics with console connect. Warn if - # they likely won't see any output. - - if not guest.devices.console: - log.warning(_("No --console device added, you likely will not " - "see text install output from the guest.")) - return + _("See the man page for examples of " + "using --location with CDROM media")) def _show_memory_warnings(guest): |