From d79ac751b2adddfaae4cd41d9f0c3f8c9c42fa59 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 16 Jun 2015 11:32:33 -0400
Subject: Update GRUB

vesamenu.c32 patch removed (merged upstream)
---
(limited to 'resources/scripts')

diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index 70835f2..45414dc 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -45,7 +45,7 @@ cd "grub/"
 # Reset to the last commit that was tested
 # ------------------------------------------------------------------------------
 
-git reset --hard fa07d919d1ff868b18d8a42276d094b63a58e299
+git reset --hard afd0f21b2027310fda52b00ac1b964041d39a363
 
 # Apply patches
 # ------------------------------------------------------------------------------
@@ -53,11 +53,6 @@ git reset --hard fa07d919d1ff868b18d8a42276d094b63a58e299
 # Replace "GNU GRUB version" in GRUB screen with "FREE AS IN FREEDOM"
 git am "../resources/grub/patch/0001-grub-core-normal-main.c-Display-FREE-AS-IN-FREEDOM-n.patch"
 
-# See 0002-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch
-# Wait for it or an improved version of it to be merged, then update GRUB and delete the patch file
-# https://people.torproject.org/~lunar/volatile/2015-03-17-e3Yp1d7FifQ/0001-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch
-git am "../resources/grub/patch/0002-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch"
-
 cd "../"
 printf "\n\n"
 
--
cgit v0.9.1