[Xen-changelog] [xen-unstable] [XEND] Do not delete VNC password from configuration.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Node ID 1f95b2a54f4cbedd11ec6a4c4f476d48f5dafdfb
# Parent  d029684fd1faab07eeaa964bc8b38ca42ff106ad
[XEND] Do not delete VNC password from configuration.
Fixes reboot of HVM guest when VNC authentication is in use.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/image.py |    6 ------
 1 files changed, 6 deletions(-)

diff -r d029684fd1fa -r 1f95b2a54f4c tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Wed Oct 25 15:29:08 2006 +0100
+++ b/tools/python/xen/xend/image.py    Fri Oct 27 18:15:14 2006 +0100
@@ -361,9 +361,6 @@ class HVMImageHandler(ImageHandler):
 
         if nographic:
             ret.append('-nographic')
-            # remove password
-            if vncpasswd_vmconfig:
-                config.remove(['vncpasswd', vncpasswd_vmconfig])
             return ret
 
         if vnc:
@@ -394,9 +391,6 @@ class HVMImageHandler(ImageHandler):
                                   'VMconfig and xend-config.')
             if vncpasswd != '':
                 self.vm.storeVm("vncpasswd", vncpasswd)
-
-        # remove password
-        config.remove(['vncpasswd', vncpasswd_vmconfig])
 
         return ret
 

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