diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-09-09 16:05:52 -0700 |
|---|---|---|
| committer | Andy Lutomirski <luto@amacapital.net> | 2014-09-09 16:05:52 -0700 |
| commit | d8f25458246c89885781ef049fdc43946c8ee536 (patch) | |
| tree | 1182233389e83027b7a4ad93c76206619049624a | |
| parent | ea19cd46cc003849af35b128d7c0ae00e2259a35 (diff) | |
| download | virtme-d8f25458246c89885781ef049fdc43946c8ee536.tar.gz | |
[BREAKING CHANGE] Make console mode the default
I suspect that most users will want a terminal most of the time.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | virtme/commands/run.py | 10 |
2 files changed, 12 insertions, 10 deletions
@@ -70,14 +70,16 @@ Note that the --kimg mode does not support modules. You can then do things like `cd /home/username` and you will have readonly access to all your files. -Console -======= - -virtme has usable console support. Pass --console to virtme-run to use it. -To exit, type ctrl-a x. +Virtme gives you console input and output by default. Type ctrl-a x to exit. +Type ctrl-a c to access the QEMU monitor. For now, the virtme console is a serial console -- virtconsole seems to be unusably buggy. I don't know of any way to keep the tty state in sync between the host and guest, so resizing the host window after starting the guest may confuse guest libraries like readline. +Graphics +======== + +If you want graphical output instead of console output, pass --graphics. Note that this is the opposite of QEMU's default behavior. + Architecture support ==================== diff --git a/virtme/commands/run.py b/virtme/commands/run.py index 44880ed..d04a4d7 100644 --- a/virtme/commands/run.py +++ b/virtme/commands/run.py @@ -49,8 +49,8 @@ def make_parser(): g = parser.add_argument_group(title='Common guest options') g.add_argument('--root', action='store', default='/', help='Local path to use as guest root') - g.add_argument('--console', action='store_true', - help='Run headless -- use ctrl-A, x to exit.') + g.add_argument('--graphics', action='store_true', + help='Show graphical output instead of using a console.') g.add_argument('--net', action='store_true', help='Enable basic network access.') g.add_argument('--balloon', action='store_true', @@ -191,7 +191,7 @@ def main(): qemuargs.extend(['-parallel', 'none']) qemuargs.extend(['-net', 'none']) - if args.console: + if not args.graphics and not args.script_sh and not args.script_exec: # It would be nice to use virtconsole, but it's terminally broken # in current kernels. Nonetheless, I'm configuring the console # manually to make it easier to tweak in the future. @@ -246,8 +246,8 @@ def main(): has_script = False def do_script(shellcmd): - if args.console: - arg_fail('scripts and --console are mutually exclusive') + if args.graphics: + arg_fail('scripts and --graphics are mutually exclusive') nonlocal has_script nonlocal need_initramfs |