ia64/xen-unstable

changeset 13205:61788aef85e0

Fix reboot of PV domains when both kernel and bootloader are unspecified
(which is supposed to default to using pygrub).

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Thu Dec 28 12:59:58 2006 +0000 (2006-12-28)
parents d759e9df902f
children 90400f2c10c1
files tools/python/xen/xend/XendConfig.py
line diff
     1.1 --- a/tools/python/xen/xend/XendConfig.py	Thu Dec 28 12:26:29 2006 +0000
     1.2 +++ b/tools/python/xen/xend/XendConfig.py	Thu Dec 28 12:59:58 2006 +0000
     1.3 @@ -1106,6 +1106,11 @@ 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 +            # We've set PV_kernel using the call above, so now we need to set
     1.9 +            # PV_bootloader as well, otherwise we're going to do the wrong
    1.10 +            # thing on reboot.
    1.11 +            self['PV_bootloader'] = 'pygrub'
    1.12          kernel_args = sxp.child_value(image_sxp, 'args', '')
    1.13          
    1.14          # attempt to extract extra arguments from SXP config