Build/Install binaries into /boot/xen when installing grub-xen.

---
v2:
- Create /boot/xen in postinst not rules
- grub-install now installs to the correct location.

diff --git a/debian/changelog b/debian/changelog
index 1f14b6c587a33013d64e012c4e1570608f9a1059..c3d9e5cae28716af58b60c59a3f62a50b45853e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ grub2 (2.02~beta2-16) unstable; urgency=medium
   [ Ian Campbell ]
   * Provide prebuilt grub-xen binaries for host use in a new grub-xen-host
     package.
+  * Build/Install binaries into /boot/xen when installing grub-xen.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 19 Oct 2014 16:28:00 +0100
 

diff --git a/debian/postinst.in b/debian/postinst.in
index 94c200cf02baee2bc43d17adcafb6d08fa0219b1..30e6947cd43e35977dee9efa48ae717cbf4d142c 100644 (file)
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -722,6 +722,17 @@ case "$1" in
       grub-yeeloong)
         grub-install --target=mipsel-loongson
       ;;
+
+      grub-xen)
+        # Install for x86_64 regardless of arch, since a 32-bit userspace can still boot with a 64-bit kernel.
+       mkdir -p /boot/xen
+        grub-install --target=x86_64-xen
+        case $(dpkg --print-architecture) in
+          i386)
+            grub-install --target=i386-xen
+          ;;
+        esac
+      ;;
     esac
 
     # If grub.cfg has been generated, update it.