mirror of
https://git.proxmox.com/git/grub2
synced 2025-10-23 08:28:07 +00:00
ac32067c63
If we don't have writable grubenv, recordfail doesn't work, which means our quickboot behavior - with a timeout of 0 - leaves the user without a reliable way to access the boot menu if they're on UEFI, because unlike BIOS, UEFI does not support checking the state of modifier keys (i.e. holding down shift at boot is not detectable). Handle this corner case by always using a non-zero timeout on EFI when save_env doesn't work. Reuse GRUB_RECORDFAIL_TIMEOUT to avoid introducing another variable.
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 9cc8bea2230362021a6f69e415001b33f3b13366 Mon Sep 17 00:00:00 2001
|
|
From: Ian Campbell <ijc@hellion.org.uk>
|
|
Date: Sat, 6 Sep 2014 12:20:12 +0100
|
|
Subject: grub-install: Install PV Xen binaries into the upstream specified
|
|
path
|
|
|
|
Upstream have defined a specification for where guests ought to place their
|
|
xenpv grub binaries in order to facilitate chainloading from a stage 1 grub
|
|
loaded from dom0.
|
|
|
|
http://xenbits.xen.org/docs/unstable-staging/misc/x86-xenpv-bootloader.html
|
|
|
|
The spec calls for installation into /boot/xen/pvboot-i386.elf or
|
|
/boot/xen/pvboot-x86_64.elf.
|
|
|
|
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
|
|
|
|
Bug-Debian: https://bugs.debian.org/762307
|
|
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-10/msg00041.html
|
|
Last-Update: 2014-10-24
|
|
|
|
Patch-Name: grub-install-pvxen-paths.patch
|
|
|
|
---
|
|
v2: Respect bootdir, create /boot/xen as needed.
|
|
---
|
|
util/grub-install.c | 24 ++++++++++++++++++++++--
|
|
1 file changed, 22 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub-install.c b/util/grub-install.c
|
|
index 73c623107..f511cfc72 100644
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -2055,6 +2055,28 @@ main (int argc, char *argv[])
|
|
}
|
|
break;
|
|
|
|
+ case GRUB_INSTALL_PLATFORM_I386_XEN:
|
|
+ {
|
|
+ char *path = grub_util_path_concat (2, bootdir, "xen");
|
|
+ char *dst = grub_util_path_concat (2, path, "pvboot-i386.elf");
|
|
+ grub_install_mkdir_p (path);
|
|
+ grub_install_copy_file (imgfile, dst, 1);
|
|
+ free (dst);
|
|
+ free (path);
|
|
+ }
|
|
+ break;
|
|
+
|
|
+ case GRUB_INSTALL_PLATFORM_X86_64_XEN:
|
|
+ {
|
|
+ char *path = grub_util_path_concat (2, bootdir, "xen");
|
|
+ char *dst = grub_util_path_concat (2, path, "pvboot-x86_64.elf");
|
|
+ grub_install_mkdir_p (path);
|
|
+ grub_install_copy_file (imgfile, dst, 1);
|
|
+ free (dst);
|
|
+ free (path);
|
|
+ }
|
|
+ break;
|
|
+
|
|
case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
|
|
case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
|
|
case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
|
|
@@ -2064,8 +2086,6 @@ main (int argc, char *argv[])
|
|
case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
|
|
case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
|
|
case GRUB_INSTALL_PLATFORM_I386_QEMU:
|
|
- case GRUB_INSTALL_PLATFORM_I386_XEN:
|
|
- case GRUB_INSTALL_PLATFORM_X86_64_XEN:
|
|
case GRUB_INSTALL_PLATFORM_I386_XEN_PVH:
|
|
grub_util_warn ("%s",
|
|
_("WARNING: no platform-specific install was performed"));
|