From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 4 Feb 2009 12:43:11 +0000 (+0000)
Subject: xend: fix vncconsole option
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14003^2~41
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=149748770bf72c2c6b51d2d1b56ec8d140dd9c7c;p=xen.git

xend: fix vncconsole option
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 9db58e2153..99111c9ccc 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -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 --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 31d3623749..f87f5ccc53 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -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)