diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-03-17 16:58:01 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-03-17 17:29:34 +0000 |
| commit | d4a3ecd091d45611a4196a55b43139fad2275238 (patch) | |
| tree | 4dd6a4b62b79d8b45864bca0d844951d2d35ecb4 /resources/scripts/helpers/download/grub | |
| parent | 1c18bf754c4e80f43962310a7f30e0faebf55b62 (diff) | |
| download | librebootfr-d4a3ecd091d45611a4196a55b43139fad2275238.tar.gz librebootfr-d4a3ecd091d45611a4196a55b43139fad2275238.zip | |
GRUB: add vesamenu.c32 support (fixes tails ISOLINUX menu)
Debian ISOLINUX menu is still broken (syslinux_configfile -i just
puts you back to the main screen but with the Debian background).
(same issue on gnewsense)
Diffstat (limited to 'resources/scripts/helpers/download/grub')
| -rwxr-xr-x | resources/scripts/helpers/download/grub | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub index 8497166e..d13fc663 100755 --- a/resources/scripts/helpers/download/grub +++ b/resources/scripts/helpers/download/grub @@ -53,23 +53,10 @@ 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 these threads on grub-dev@gnu.org: -## [bug #44238] Add support for menu.c32 and vesamenu.c32 in lib/syslinux_parse -## [bug #44239] Behavior of syslinux_parse differs from SYSLINUX for initrd= option -## These make vesamenu.c32 work (translation: Debian/Tails ISOLINUX) but they are -## buggy at the moment; Trisquel ISOLINUX parsing fails with these patches, for instance: -## "error: syntax error.", "error: Incorrect command." -## The mailing list contains updated versions of the patches mentioned below -## Work with Lunar^ on IRC on finishing the patch so that it fixes the issue -## while not causing other regressions. Wait until this is merged in GRUB(upstream). -# Add support for menu.c32 and vesamenu.c32 in lib/syslinux_parse -# See https://savannah.gnu.org/bugs/index.php?44238 -# TODO: Remove this patch when it is upstreamed. -# git am "../resources/grub/patch/0002-syslinux_parse-add-support-for-vesa-menu.c32.patch" -# Behavior of syslinux_parse differs from SYSLINUX for initrd= option -# See https://savannah.gnu.org/bugs/index.php?44239 -# TODO: Remove this patch when it is upstreamed. -# git am "../resources/grub/patch/0003-syslinux_parse-keep-initrd-in-kernel-the-command-lin.patch" +# See 0002-lib-syslinux_parse-add-support-for-vesa-menu.c32.patch +# report back to Lunar^ if it works properly. The other patch was already merged in an improved version +# 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" |