[Xen-changelog] [xen-unstable] When booting via xm, only run the bootloader if it's in non-interactive mode:

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1168349085 0
# Node ID 3040ba0f2d3d8659ffadda1f5b599a7ca60f8b53
# Parent  3f8930dc7d9085f61eb83662577f44fdaa7d18ba
When booting via xm, only run the bootloader if it's in non-interactive mode:
otherwise we lose the user's named kernel and try to bootload the temporary
file pygrub returned.

Signed-off-by: John Levon <john.levon@xxxxxxx>
---
 tools/python/xen/xm/create.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -r 3f8930dc7d90 -r 3040ba0f2d3d tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Tue Jan 09 13:24:44 2007 +0000
+++ b/tools/python/xen/xm/create.py     Tue Jan 09 13:24:45 2007 +0000
@@ -765,7 +765,12 @@ def make_config(vals):
     if vals.bootloader:
         if vals.bootloader == "pygrub":
             vals.bootloader = osdep.pygrub_path
-        config_image = run_bootloader(vals, config_image)
+
+        # if a kernel is specified, we're using the bootloader
+        # non-interactively, and need to let xend run it so we preserve the
+        # real kernel choice.
+        if not vals.kernel:
+            config_image = run_bootloader(vals, config_image)
         config.append(['bootloader', vals.bootloader])
         if vals.bootargs:
             config.append(['bootloader_args', vals.bootargs])

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