NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

cli: Add explicit --autoconsole option

Browse Source 
Allows the user to override our implicit '--autoconsole default'
handling

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-11-25 06:22:14 -05:00
parent 85a33caa76
commit e488696cef
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/clitest.py
View File

@ -928,7 +928,7 @@ c.add_invalid("--file /foo/bar/baz --pxe") # Trying to use unmanaged storage wi
# QEMU/KVM specific tests #
###########################
c = vinst.add_category("kvm-generic", "--connect %(URI-KVM)s --noautoconsole")
c = vinst.add_category("kvm-generic", "--connect %(URI-KVM)s --autoconsole none")
c.add_compare("--os-variant fedora-unknown --file %(EXISTIMG1)s --location %(TREEDIR)s --extra-args console=ttyS0 --cpu host --channel none --console none --sound none --redirdev none --boot cmdline='foo bar baz'", "kvm-fedoralatest-url", prerun_check=has_old_osinfo) # Fedora Directory tree URL install with extra-args
c.add_compare("--test-media-detection %(TREEDIR)s --arch x86_64 --hvm", "test-url-detection") # --test-media-detection
c.add_compare("--os-variant http://fedoraproject.org/fedora/20 --disk %(EXISTIMG1)s,device=floppy --disk %(NEWIMG1)s,size=.01,format=vmdk --location %(TREEDIR)s --extra-args console=ttyS0 --quiet", "quiet-url", prerun_check=has_old_osinfo) # Quiet URL install should make no noise
@ -1101,6 +1101,9 @@ c.add_valid("--pxe --graphics vnc --noreboot", grep="testsuite console command:
c.add_valid("--nographics --cdrom %(EXISTIMG1)s") # console warning about cdrom + nographics
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
c.add_valid("--pxe --nographics --autoconsole graphical", grep="testsuite console command: ['virt-viewer'") # force --autoconsole graphical
c.add_valid("--pxe --autoconsole text", grep="testsuite console command: ['virsh'") # force --autoconsole text
c.add_invalid("--pxe --autoconsole badval") # bad --autoconsole value
##################

9
virtinst/cli.py
View File

@ -533,8 +533,13 @@ def add_misc_options(grp, prompt=False, replace=False,
default=False, help=argparse.SUPPRESS)
if noautoconsole:
grp.add_argument("--noautoconsole", action="store_const",
dest="autoconsole", const="none", default="default",
grp.add_argument("--autoconsole", default="default",
help=_("Configure guest console auto connect. Example:\n"
"--autoconsole text\n"
"--autoconsole graphical\n"
"--autoconsole none"))
grp.add_argument("--noautoconsole", dest="autoconsole",
action="store_const", const="none",
help=_("Don't automatically try to connect to the guest console"))
if noreboot: