This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


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

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] Fix booting caused by recent thinko.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 29 Dec 2006 14:20:13 -0800
Delivery-date: Fri, 29 Dec 2006 14:20:55 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] Fix booting caused by recent thinko., Xen patchbot-unstable <=