ia64/xen-unstable

changeset 12550:f15b6cbb654b

Stop the kernel and ramdisk from being nuked if the kernel_external bootloader
setting is being used.

From Jim Fehlig <jfehlig@novell.com>.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Wed Nov 22 14:01:51 2006 +0000 (2006-11-22)
parents 899fb1b891a9
children cbbfadf7c8a5
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Wed Nov 22 13:27:52 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Wed Nov 22 14:01:51 2006 +0000
     1.3 @@ -1318,7 +1318,7 @@ class XendDomainInfo:
     1.4  
     1.5              self._createDevices()
     1.6  
     1.7 -            if self.info['bootloader']:
     1.8 +            if self.info['bootloader'] not in [None, 'kernel_external']:
     1.9                  self.image.cleanupBootloading()
    1.10  
    1.11              self.info['start_time'] = time.time()
    1.12 @@ -1326,7 +1326,8 @@ class XendDomainInfo:
    1.13              self._stateSet(DOM_STATE_RUNNING)
    1.14          except RuntimeError, exn:
    1.15              log.exception("XendDomainInfo.initDomain: exception occurred")
    1.16 -            if self.info['bootloader'] and self.image is not None:
    1.17 +            if self.info['bootloader'] not in [None, 'kernel_external'] \
    1.18 +                   and self.image is not None:
    1.19                  self.image.cleanupBootloading()
    1.20              raise VmError(str(exn))
    1.21