mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
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>
This commit is contained in:
1 parent
d82f56fc1a
commit
7b0a6bf9f4
1 file changed
+3
-2
@@ -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))
|
||||
|
||||
|
||||