[Xen-changelog] [xen-unstable] Fix booting caused by recent thinko.

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1167318015 0
# Node ID 90400f2c10c1d6695fda4ba0b11cb18f2f0bd0e9
# Parent  61788aef85e0589a46bfb2bcd19b9bd5420d5214
Fix booting caused by recent thinko.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 61788aef85e0 -r 90400f2c10c1 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Dec 28 12:59:58 2006 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Thu Dec 28 15:00:15 2006 +0000
@@ -1106,7 +1106,8 @@ class XendConfig(dict):
 
         self['PV_kernel'] = sxp.child_value(image_sxp, 'kernel','')
         self['PV_ramdisk'] = sxp.child_value(image_sxp, 'ramdisk','')
-        if not self['PV_bootloader'] and self['PV_kernel']:
+        if not self['PV_bootloader'] \
+               and sxp.child_value(image_sxp, 'kernel', ''):
             # We've set PV_kernel using the call above, so now we need to set
             # PV_bootloader as well, otherwise we're going to do the wrong
             # thing on reboot.

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