Small cleanup

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 2a69327b475a91af151c2dbfe6c147f885eff7a9..5dc30411777868209c962a33a3425d0b2c1c0aa0 100644 (file)
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -232,32 +232,6 @@ grub_multiboot (int argc, char *argv[])
   else if (grub_multiboot_load_elf (file, buffer) != GRUB_ERR_NONE)
     goto fail;
 
-  if (header->flags & MULTIBOOT_VIDEO_MODE)
-    {
-      switch (header->mode_type)
-       {
-       case 1:
-         grub_env_set ("gfxpayload", "text");
-         break;
-
-       case 0:
-         {
-           char buf[sizeof ("XXXXXXXXXXxXXXXXXXXXXxXXXXXXXXXX,XXXXXXXXXXxXXXXXXXXXX,auto")];
-           if (header->depth && header->width && header->height)
-             grub_sprintf (buf, "%dx%dx%d,%dx%d,auto", header->width,
-                           header->height, header->depth, header->width,
-                           header->height);
-           else if (header->width && header->height)
-             grub_sprintf (buf, "%dx%d,auto", header->width, header->height);
-           else
-             grub_sprintf (buf, "auto");
-
-           grub_env_set ("gfxpayload", buf);
-           break;
-         }
-       }
-    }
-
   grub_multiboot_set_bootdev ();
 
   grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 0);

diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 8f63674320a7a5c5e530f3b5407c38e3fdf066ce..2e35183a4db67c37325dbb4acccf1d017ce7181d 100644 (file)
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -104,7 +104,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 
   alloc_mbi = grub_multiboot_get_mbi_size ();
   grub_multiboot_payload_orig
-    = grub_relocator32_alloc (grub_multiboot_pure_size + alloc_mbi);
+    = grub_relocator32_alloc (grub_multiboot_pure_size + alloc_mbi + 65536);
 
   if (!grub_multiboot_payload_orig)
     return grub_errno;