mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
xm: Fix xm start -c / --vncviewer
In xm start the --vncviewer option has no effect, instead -c tries to both connect to the console and start vncviewer. Additionally, to start vncviewer it uses the domid variable which is only defined a few lines later. Thus xm start -c doesn't work at all. This patch fixes both problems. Signed-off-by: Kevin Wolf <kwolf@suse.de>
This commit is contained in:
1 parent
270fdae556
commit
0ae658ea9f
1 file changed
+4
-3
@@ -1224,9 +1224,6 @@ def xm_start(args):
|
||||
if console_autoconnect:
|
||||
start_do_console(dom)
|
||||
|
||||
if console_autoconnect:
|
||||
console.runVncViewer(domid, vncviewer_autopass, True)
|
||||
|
||||
try:
|
||||
if serverType == SERVER_XEN_API:
|
||||
server.xenapi.VM.start(get_single_vm(dom), paused)
|
||||
@@ -1241,6 +1238,10 @@ def xm_start(args):
|
||||
if domid == -1:
|
||||
raise xmlrpclib.Fault(0, "Domain '%s' is not started" % dom)
|
||||
|
||||
if vncviewer:
|
||||
console.runVncViewer(domid, vncviewer_autopass, True)
|
||||
|
||||
|
||||
def xm_delete(args):
|
||||
arg_check(args, "delete", 1)
|
||||
dom = args[0]
|
||||
|
||||