This patch would make 32-bit and 64-bit GRUB conflict. This is a valid
usecase as it's possible to make biarch image by having both kernels and
32-bit userspace
On Dec 12, 2013 4:38 PM, "Colin Watson" <cjwat...@ubuntu.com> wrote:

> * util/grub-install.c: Copy core image to GRUBDIR/grub.xen on Xen
> platforms.
> ---
>  ChangeLog           |  7 +++++++
>  util/grub-install.c | 11 +++++++++--
>  2 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 58304f7..f280b59 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,5 +1,12 @@
>  2013-12-12  Colin Watson  <cjwat...@ubuntu.com>
>
> +       Improve installation on Xen.
> +
> +       * util/grub-install.c: Copy core image to GRUBDIR/grub.xen on Xen
> +       platforms.
> +
> +2013-12-12  Colin Watson  <cjwat...@ubuntu.com>
> +
>         Build grub.xen.
>
>         * .gitignore: Add xen.cfg.
> diff --git a/util/grub-install.c b/util/grub-install.c
> index 5d22f90..2da05c2 100644
> --- a/util/grub-install.c
> +++ b/util/grub-install.c
> @@ -1576,6 +1576,15 @@ main (int argc, char *argv[])
>         }
>        break;
>
> +    case GRUB_INSTALL_PLATFORM_I386_XEN:
> +    case GRUB_INSTALL_PLATFORM_X86_64_XEN:
> +      {
> +       char *dst = grub_util_path_concat (2, grubdir, "grub.xen");
> +       grub_install_copy_file (imgfile, dst, 1);
> +       free (dst);
> +      }
> +      break;
> +
>      case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
>      case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
>      case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
> @@ -1584,8 +1593,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;
> --
> 1.8.4.4
>
> _______________________________________________
> Xen-devel mailing list
> xen-de...@lists.xen.org
> http://lists.xen.org/xen-devel
>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to