ia64/xen-unstable

changeset 19159:7a3124098155

xend: fix vncconsole option
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Feb 04 12:43:11 2009 +0000 (2009-02-04)
parents 97ca3400d17c
children faf20eb0b69e
files tools/python/xen/xend/image.py tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Wed Feb 04 12:01:47 2009 +0000
     1.2 +++ b/tools/python/xen/xend/image.py	Wed Feb 04 12:43:11 2009 +0000
     1.3 @@ -372,8 +372,6 @@ class ImageHandler:
     1.4              env['DISPLAY'] = self.display
     1.5          if self.xauthority:
     1.6              env['XAUTHORITY'] = self.xauthority
     1.7 -        if self.vncconsole:
     1.8 -            args = args + ([ "-vncviewer" ])
     1.9          unique_id = "%i-%i" % (self.vm.getDomid(), time.time())
    1.10          sentinel_path = sentinel_path_prefix + unique_id
    1.11          sentinel_path_fifo = sentinel_path + '.fifo'
     2.1 --- a/tools/python/xen/xm/create.py	Wed Feb 04 12:01:47 2009 +0000
     2.2 +++ b/tools/python/xen/xm/create.py	Wed Feb 04 12:43:11 2009 +0000
     2.3 @@ -1337,7 +1337,7 @@ def main(argv):
     2.4      elif not opts.is_xml:
     2.5          dom = make_domain(opts, config)
     2.6          
     2.7 -    if opts.vals.vncviewer:
     2.8 +    if opts.vals.vncconsole:
     2.9          domid = domain_name_to_domid(sxp.child_value(config, 'name', -1))
    2.10          vncviewer_autopass = getattr(opts.vals,'vncviewer-autopass', False)
    2.11          console.runVncViewer(domid, vncviewer_autopass, True)