[Xen-changelog] [xen-unstable] Stop the kernel and ramdisk from being nuked if the kernel_external bootloader

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID f15b6cbb654b324a52212a9de2bf32388bda4bff
# Parent  899fb1b891a9b20e1aa2a0de16a03bf1bf435ee6
Stop the kernel and ramdisk from being nuked if the kernel_external bootloader
setting is being used.

>From Jim Fehlig <jfehlig@xxxxxxxxxx>.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 899fb1b891a9 -r f15b6cbb654b tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Wed Nov 22 13:27:52 2006 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py   Wed Nov 22 14:01:51 2006 +0000
@@ -1318,7 +1318,7 @@ class XendDomainInfo:
 
             self._createDevices()
 
-            if self.info['bootloader']:
+            if self.info['bootloader'] not in [None, 'kernel_external']:
                 self.image.cleanupBootloading()
 
             self.info['start_time'] = time.time()
@@ -1326,7 +1326,8 @@ class XendDomainInfo:
             self._stateSet(DOM_STATE_RUNNING)
         except RuntimeError, exn:
             log.exception("XendDomainInfo.initDomain: exception occurred")
-            if self.info['bootloader'] and self.image is not None:
+            if self.info['bootloader'] not in [None, 'kernel_external'] \
+                   and self.image is not None:
                 self.image.cleanupBootloading()
             raise VmError(str(exn))
 

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