ia64/xen-unstable

changeset 6901:2dcfb85a95b9

Maybe fix running bootloader after reboot.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Sep 15 17:19:08 2005 +0000 (2005-09-15)
parents 2f5537317988
children cedfbb032261
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Sep 15 16:55:32 2005 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Sep 15 17:19:08 2005 +0000
     1.3 @@ -984,13 +984,13 @@ class XendDomainInfo:
     1.4              self.exportToDB()
     1.5              self.restart_state = STATE_RESTART_BOOTING
     1.6              if self.bootloader:
     1.7 -                self.config = self.bootloader_config()
     1.8 +                self.configure_bootloader()
     1.9              self.construct(self.config)
    1.10              self.saveToDB()
    1.11          finally:
    1.12              self.restart_state = None
    1.13  
    1.14 -    def bootloader_config(self):
    1.15 +    def configure_bootloader(self):
    1.16          # if we're restarting with a bootloader, we need to run it
    1.17          # FIXME: this assumes the disk is the first device and
    1.18          # that we're booting from the first disk
    1.19 @@ -1005,8 +1005,7 @@ class XendDomainInfo:
    1.20              msg = "Had a bootloader specified, but can't find disk"
    1.21              log.error(msg)
    1.22              raise VmError(msg)
    1.23 -        config = sxp.merge(['vm', blcfg ], self.config)
    1.24 -        return config
    1.25 +        self.config = sxp.merge(['vm', ['image', blcfg]], self.config)
    1.26  
    1.27      def configure_backends(self):
    1.28          """Set configuration flags if the vm is a backend for netif or blkif.