[Xen-changelog] [xen-unstable] xend: fix vncconsole option

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1233751391 0
# Node ID 7a3124098155e710147420047538dc2ef785633d
# Parent  97ca3400d17c5f14af3c36145963d7c6c9a9416e
xend: fix vncconsole option
From: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/python/xen/xend/image.py |    2 --
 tools/python/xen/xm/create.py  |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff -r 97ca3400d17c -r 7a3124098155 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Wed Feb 04 12:01:47 2009 +0000
+++ b/tools/python/xen/xend/image.py    Wed Feb 04 12:43:11 2009 +0000
@@ -372,8 +372,6 @@ class ImageHandler:
             env['DISPLAY'] = self.display
         if self.xauthority:
             env['XAUTHORITY'] = self.xauthority
-        if self.vncconsole:
-            args = args + ([ "-vncviewer" ])
         unique_id = "%i-%i" % (self.vm.getDomid(), time.time())
         sentinel_path = sentinel_path_prefix + unique_id
         sentinel_path_fifo = sentinel_path + '.fifo'
diff -r 97ca3400d17c -r 7a3124098155 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Wed Feb 04 12:01:47 2009 +0000
+++ b/tools/python/xen/xm/create.py     Wed Feb 04 12:43:11 2009 +0000
@@ -1337,7 +1337,7 @@ def main(argv):
     elif not opts.is_xml:
         dom = make_domain(opts, config)
         
-    if opts.vals.vncviewer:
+    if opts.vals.vncconsole:
         domid = domain_name_to_domid(sxp.child_value(config, 'name', -1))
         vncviewer_autopass = getattr(opts.vals,'vncviewer-autopass', False)
         console.runVncViewer(domid, vncviewer_autopass, True)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog