ia64/xen-unstable

changeset 13206:90400f2c10c1

Fix booting caused by recent thinko.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Thu Dec 28 15:00:15 2006 +0000 (2006-12-28)
parents 61788aef85e0
children 51ea6202c4f2
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Thu Dec 28 12:59:58 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Thu Dec 28 15:00:15 2006 +0000
     1.3 @@ -1106,7 +1106,8 @@ class XendConfig(dict):
     1.4  
     1.5          self['PV_kernel'] = sxp.child_value(image_sxp, 'kernel','')
     1.6          self['PV_ramdisk'] = sxp.child_value(image_sxp, 'ramdisk','')
     1.7 -        if not self['PV_bootloader'] and self['PV_kernel']:
     1.8 +        if not self['PV_bootloader'] \
     1.9 +               and sxp.child_value(image_sxp, 'kernel', ''):
    1.10              # We've set PV_kernel using the call above, so now we need to set
    1.11              # PV_bootloader as well, otherwise we're going to do the wrong
    1.12              # thing on reboot.