[Xen-changelog] Fix bootloader support some more.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 9d4f4ff1ff7732669ed1bde4393bac3c9af7073f
# Parent  cedfbb032261b5eb6c2ba7f38abd4e2fb63990a5
Fix bootloader support some more.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r cedfbb032261 -r 9d4f4ff1ff77 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 17:40:16 2005
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Sep 15 18:38:44 2005
@@ -642,7 +642,6 @@
             self.configure_cpus(config)
             self.init_domain()
             self.register_domain()
-            self.configure_bootloader()
 
             # Create domain devices.
             self.configure_backends()
@@ -909,11 +908,6 @@
             self.config.remove(['device', dev_config])
         self.deleteDevice(type, dev.getId())
 
-    def configure_bootloader(self):
-        """Configure boot loader.
-        """
-        self.bootloader = sxp.child_value(self.config, "bootloader")
-
     def configure_restart(self):
         """Configure the vm restart mode.
         """
@@ -983,14 +977,16 @@
             self.restart_check()
             self.exportToDB()
             self.restart_state = STATE_RESTART_BOOTING
-            if self.bootloader:
-                self.configure_bootloader()
+            self.configure_bootloader()
             self.construct(self.config)
             self.saveToDB()
         finally:
             self.restart_state = None
 
     def configure_bootloader(self):
+        self.bootloader = sxp.child_value(self.config, "bootloader")
+        if not self.bootloader:
+            return
         # 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

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