ia64/xen-unstable

changeset 13341:3040ba0f2d3d

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@sun.com>
author Tim Deegan <Tim.Deegan@xensource.com>
date Tue Jan 09 13:24:45 2007 +0000 (2007-01-09)
parents 3f8930dc7d90
children de6b5a76d680
files tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/python/xen/xm/create.py	Tue Jan 09 13:24:44 2007 +0000
     1.2 +++ b/tools/python/xen/xm/create.py	Tue Jan 09 13:24:45 2007 +0000
     1.3 @@ -765,7 +765,12 @@ def make_config(vals):
     1.4      if vals.bootloader:
     1.5          if vals.bootloader == "pygrub":
     1.6              vals.bootloader = osdep.pygrub_path
     1.7 -        config_image = run_bootloader(vals, config_image)
     1.8 +
     1.9 +        # if a kernel is specified, we're using the bootloader
    1.10 +        # non-interactively, and need to let xend run it so we preserve the
    1.11 +        # real kernel choice.
    1.12 +        if not vals.kernel:
    1.13 +            config_image = run_bootloader(vals, config_image)
    1.14          config.append(['bootloader', vals.bootloader])
    1.15          if vals.bootargs:
    1.16              config.append(['bootloader_args', vals.bootargs])