[Xen-changelog] Maybe fix running bootloader after reboot.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 2dcfb85a95b920941a5236bb4b14658a62ecb460
# Parent  2f5537317988865e0625e7d18e45d10fb1bbdb92
Maybe fix running bootloader after reboot.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 2f5537317988 -r 2dcfb85a95b9 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 16:55:32 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 17:19:08 2005
@@ -984,13 +984,13 @@
             self.exportToDB()
             self.restart_state = STATE_RESTART_BOOTING
             if self.bootloader:
-                self.config = self.bootloader_config()
+                self.configure_bootloader()
             self.construct(self.config)
             self.saveToDB()
         finally:
             self.restart_state = None
 
-    def bootloader_config(self):
+    def configure_bootloader(self):
         # if we're restarting with a bootloader, we need to run it
         # FIXME: this assumes the disk is the first device and
         # that we're booting from the first disk
@@ -1005,8 +1005,7 @@
             msg = "Had a bootloader specified, but can't find disk"
             log.error(msg)
             raise VmError(msg)
-        config = sxp.merge(['vm', blcfg ], self.config)
-        return config
+        self.config = sxp.merge(['vm', ['image', blcfg]], self.config)
 
     def configure_backends(self):
         """Set configuration flags if the vm is a backend for netif or blkif.

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