From: Tim Deegan Date: Tue, 9 Jan 2007 13:24:45 +0000 (+0000) Subject: When booting via xm, only run the bootloader if it's in non-interactive mode: X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15422^2~11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db442369b3747f1d4be9b31d9ff459536e2a0a4b;p=xen.git 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 --- diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 175e0fffc7..094b583d57 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -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])