[Xen-changelog] [xen-unstable] Fix reboot of PV domains when both kernel and bootloader are unspecified

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1167310798 0
# Node ID 61788aef85e0589a46bfb2bcd19b9bd5420d5214
# Parent  d759e9df902f4a4b0be5b25cd9cb8ef08e5d5174
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@xxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    5 +++++
 1 files changed, 5 insertions(+)

diff -r d759e9df902f -r 61788aef85e0 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Dec 28 12:26:29 2006 +0000
+++ b/tools/python/xen/xend/XendConfig.py       Thu Dec 28 12:59:58 2006 +0000
@@ -1106,6 +1106,11 @@ 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']:
+            # 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.
+            self['PV_bootloader'] = 'pygrub'
         kernel_args = sxp.child_value(image_sxp, 'args', '')
         
         # attempt to extract extra arguments from SXP config

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