From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1XgrCh-0007Zj-Df for mharc-grub-devel@gnu.org; Wed, 22 Oct 2014 04:23:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgrCZ-0007MU-Tj for grub-devel@gnu.org; Wed, 22 Oct 2014 04:23:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgrCU-0000Hs-FJ for grub-devel@gnu.org; Wed, 22 Oct 2014 04:23:27 -0400 Received: from benson.vm.bytemark.co.uk ([212.110.190.137]:50159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgrCU-0000Hl-A0 for grub-devel@gnu.org; Wed, 22 Oct 2014 04:23:22 -0400 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginm.net ([86.6.25.227] helo=celaeno.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XgrCS-0002vh-4N; Wed, 22 Oct 2014 09:23:20 +0100 Received: from dagon.hellion.org.uk ([192.168.1.7]) by celaeno.hellion.org.uk with smtp (Exim 4.80) (envelope-from ) id 1XgrCP-0000QL-Gt; Wed, 22 Oct 2014 09:23:18 +0100 Received: by dagon.hellion.org.uk (sSMTP sendmail emulation); Wed, 22 Oct 2014 09:23:17 +0100 From: Ian Campbell To: grub-devel@gnu.org, xen-devel@lists.xen.org Subject: [PATCH] grub-install: Install PV Xen binaries into the upstream specified path Date: Wed, 22 Oct 2014 09:23:17 +0100 Message-Id: <1413966197-12364-1-git-send-email-ijc@hellion.org.uk> X-Mailer: git-send-email 2.1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.110.190.137 Cc: 759018@bugs.debian.org, Ian Campbell X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2014 08:23:33 -0000 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 --- util/grub-install.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c index 70f514c..5f4d737 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1979,6 +1979,14 @@ main (int argc, char *argv[]) } break; + case GRUB_INSTALL_PLATFORM_I386_XEN: + grub_install_copy_file (imgfile, "/boot/xen/pvboot-i386.elf", 1); + break; + + case GRUB_INSTALL_PLATFORM_X86_64_XEN: + grub_install_copy_file (imgfile, "/boot/xen/pvboot-x86_64.elf", 1); + break; + case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON: case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS: case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: @@ -1987,8 +1995,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: grub_util_warn ("%s", _("WARNING: no platform-specific install was performed")); break; -- 2.1.0