* [PATCH] grub: update 2.02~beta3 v2
@ 2016-09-03 7:15 Marcel Lorenz
2016-09-26 19:13 ` Michael Tremer
0 siblings, 1 reply; 2+ messages in thread
From: Marcel Lorenz @ 2016-09-03 7:15 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 35337 bytes --]
The IPfire's screen resulution is changed from 640x480 to 1280x800
with fallback to 1024x786. Better for restore IPFire with network problems
The lfs/flash-images is updated to fix build fail
The "disable VGA fallback" patch is not more needed and removed
The Unifont is updated to 9.0.02
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/grub2/default | 1 +
config/rootfiles/common/i586/grub | 125 +++++++++++++++++++++-
config/rootfiles/common/x86_64/grub | 127 ++++++++++++++++++++++-
lfs/flash-images | 2 +-
lfs/grub | 20 ++--
src/patches/grub-2.00_disable_vga_fallback.patch | 15 ---
6 files changed, 256 insertions(+), 34 deletions(-)
delete mode 100644 src/patches/grub-2.00_disable_vga_fallback.patch
diff --git a/config/grub2/default b/config/grub2/default
index 39eed0f..4139e9c 100644
--- a/config/grub2/default
+++ b/config/grub2/default
@@ -5,3 +5,4 @@ GRUB_CMDLINE_LINUX="panic=10"
GRUB_DISABLE_RECOVERY="true"
GRUB_BACKGROUND="/boot/grub/splash.png"
GRUB_FONT="/boot/grub/unifont.pf2"
+GRUB_GFXMODE=1280x800,1024x768
diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub
index 9d71942..010b52c 100644
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@ -15,19 +15,24 @@ etc/grub.d/41_custom
etc/grub.d/README
etc/grub2.cfg
usr/bin/grub-editenv
+usr/bin/grub-file
usr/bin/grub-fstest
+usr/bin/grub-glue-efi
usr/bin/grub-kbdcomp
usr/bin/grub-menulst2cfg
usr/bin/grub-mkfont
usr/bin/grub-mkimage
usr/bin/grub-mklayout
+usr/bin/grub-mknetdir
usr/bin/grub-mkpasswd-pbkdf2
usr/bin/grub-mkrelpath
usr/bin/grub-mkrescue
usr/bin/grub-mkstandalone
+usr/bin/grub-render-label
usr/bin/grub-script-check
-usr/lib/grub
-usr/lib/grub/i386-pc
+usr/bin/grub-syslinux2cfg
+#usr/lib/grub
+#usr/lib/grub/i386-pc
usr/lib/grub/i386-pc/acpi.mod
usr/lib/grub/i386-pc/acpi.module
usr/lib/grub/i386-pc/adler32.mod
@@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod
usr/lib/grub/i386-pc/all_video.module
usr/lib/grub/i386-pc/aout.mod
usr/lib/grub/i386-pc/aout.module
+usr/lib/grub/i386-pc/archelp.mod
+usr/lib/grub/i386-pc/archelp.module
usr/lib/grub/i386-pc/at_keyboard.mod
usr/lib/grub/i386-pc/at_keyboard.module
usr/lib/grub/i386-pc/ata.mod
@@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image
usr/lib/grub/i386-pc/boot.img
usr/lib/grub/i386-pc/boot.mod
usr/lib/grub/i386-pc/boot.module
+usr/lib/grub/i386-pc/boot_hybrid.image
+usr/lib/grub/i386-pc/boot_hybrid.img
usr/lib/grub/i386-pc/bsd.mod
usr/lib/grub/i386-pc/bsd.module
+usr/lib/grub/i386-pc/bswap_test.mod
+usr/lib/grub/i386-pc/bswap_test.module
usr/lib/grub/i386-pc/btrfs.mod
usr/lib/grub/i386-pc/btrfs.module
usr/lib/grub/i386-pc/bufio.mod
usr/lib/grub/i386-pc/bufio.module
usr/lib/grub/i386-pc/cat.mod
usr/lib/grub/i386-pc/cat.module
+usr/lib/grub/i386-pc/cbfs.mod
+usr/lib/grub/i386-pc/cbfs.module
+usr/lib/grub/i386-pc/cbls.mod
+usr/lib/grub/i386-pc/cbls.module
+usr/lib/grub/i386-pc/cbmemc.mod
+usr/lib/grub/i386-pc/cbmemc.module
+usr/lib/grub/i386-pc/cbtable.mod
+usr/lib/grub/i386-pc/cbtable.module
+usr/lib/grub/i386-pc/cbtime.mod
+usr/lib/grub/i386-pc/cbtime.module
usr/lib/grub/i386-pc/cdboot.image
usr/lib/grub/i386-pc/cdboot.img
usr/lib/grub/i386-pc/chain.mod
usr/lib/grub/i386-pc/chain.module
+usr/lib/grub/i386-pc/cmdline_cat_test.mod
+usr/lib/grub/i386-pc/cmdline_cat_test.module
+usr/lib/grub/i386-pc/cmosdump.mod
+usr/lib/grub/i386-pc/cmosdump.module
usr/lib/grub/i386-pc/cmostest.mod
usr/lib/grub/i386-pc/cmostest.module
usr/lib/grub/i386-pc/cmp.mod
usr/lib/grub/i386-pc/cmp.module
+usr/lib/grub/i386-pc/cmp_test.mod
+usr/lib/grub/i386-pc/cmp_test.module
usr/lib/grub/i386-pc/command.lst
usr/lib/grub/i386-pc/config.h
usr/lib/grub/i386-pc/configfile.mod
@@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod
usr/lib/grub/i386-pc/cryptodisk.module
usr/lib/grub/i386-pc/cs5536.mod
usr/lib/grub/i386-pc/cs5536.module
+usr/lib/grub/i386-pc/ctz_test.mod
+usr/lib/grub/i386-pc/ctz_test.module
usr/lib/grub/i386-pc/date.mod
usr/lib/grub/i386-pc/date.module
usr/lib/grub/i386-pc/datehook.mod
usr/lib/grub/i386-pc/datehook.module
usr/lib/grub/i386-pc/datetime.mod
usr/lib/grub/i386-pc/datetime.module
+usr/lib/grub/i386-pc/disk.mod
+usr/lib/grub/i386-pc/disk.module
usr/lib/grub/i386-pc/diskboot.image
usr/lib/grub/i386-pc/diskboot.img
usr/lib/grub/i386-pc/diskfilter.mod
usr/lib/grub/i386-pc/diskfilter.module
+usr/lib/grub/i386-pc/div.mod
+usr/lib/grub/i386-pc/div.module
+usr/lib/grub/i386-pc/div_test.mod
+usr/lib/grub/i386-pc/div_test.module
usr/lib/grub/i386-pc/dm_nv.mod
usr/lib/grub/i386-pc/dm_nv.module
usr/lib/grub/i386-pc/drivemap.mod
@@ -119,6 +154,8 @@ usr/lib/grub/i386-pc/ehci.mod
usr/lib/grub/i386-pc/ehci.module
usr/lib/grub/i386-pc/elf.mod
usr/lib/grub/i386-pc/elf.module
+usr/lib/grub/i386-pc/eval.mod
+usr/lib/grub/i386-pc/eval.module
usr/lib/grub/i386-pc/exfat.mod
usr/lib/grub/i386-pc/exfat.module
usr/lib/grub/i386-pc/exfctest.mod
@@ -129,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod
usr/lib/grub/i386-pc/extcmd.module
usr/lib/grub/i386-pc/fat.mod
usr/lib/grub/i386-pc/fat.module
+usr/lib/grub/i386-pc/file.mod
+usr/lib/grub/i386-pc/file.module
usr/lib/grub/i386-pc/font.mod
usr/lib/grub/i386-pc/font.module
usr/lib/grub/i386-pc/freedos.mod
@@ -150,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod
usr/lib/grub/i386-pc/gcry_crc.module
usr/lib/grub/i386-pc/gcry_des.mod
usr/lib/grub/i386-pc/gcry_des.module
+usr/lib/grub/i386-pc/gcry_dsa.mod
+usr/lib/grub/i386-pc/gcry_dsa.module
+usr/lib/grub/i386-pc/gcry_idea.mod
+usr/lib/grub/i386-pc/gcry_idea.module
usr/lib/grub/i386-pc/gcry_md4.mod
usr/lib/grub/i386-pc/gcry_md4.module
usr/lib/grub/i386-pc/gcry_md5.mod
@@ -160,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod
usr/lib/grub/i386-pc/gcry_rijndael.module
usr/lib/grub/i386-pc/gcry_rmd160.mod
usr/lib/grub/i386-pc/gcry_rmd160.module
+usr/lib/grub/i386-pc/gcry_rsa.mod
+usr/lib/grub/i386-pc/gcry_rsa.module
usr/lib/grub/i386-pc/gcry_seed.mod
usr/lib/grub/i386-pc/gcry_seed.module
usr/lib/grub/i386-pc/gcry_serpent.mod
@@ -187,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod
usr/lib/grub/i386-pc/gfxmenu.module
usr/lib/grub/i386-pc/gfxterm.mod
usr/lib/grub/i386-pc/gfxterm.module
+usr/lib/grub/i386-pc/gfxterm_background.mod
+usr/lib/grub/i386-pc/gfxterm_background.module
+usr/lib/grub/i386-pc/gfxterm_menu.mod
+usr/lib/grub/i386-pc/gfxterm_menu.module
usr/lib/grub/i386-pc/gmodule.pl
usr/lib/grub/i386-pc/gptsync.mod
usr/lib/grub/i386-pc/gptsync.module
@@ -208,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod
usr/lib/grub/i386-pc/hfs.module
usr/lib/grub/i386-pc/hfsplus.mod
usr/lib/grub/i386-pc/hfsplus.module
+usr/lib/grub/i386-pc/hfspluscomp.mod
+usr/lib/grub/i386-pc/hfspluscomp.module
usr/lib/grub/i386-pc/http.mod
usr/lib/grub/i386-pc/http.module
usr/lib/grub/i386-pc/iorw.mod
@@ -226,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod
usr/lib/grub/i386-pc/keystatus.module
usr/lib/grub/i386-pc/ldm.mod
usr/lib/grub/i386-pc/ldm.module
+usr/lib/grub/i386-pc/legacy_password_test.mod
+usr/lib/grub/i386-pc/legacy_password_test.module
usr/lib/grub/i386-pc/legacycfg.mod
usr/lib/grub/i386-pc/legacycfg.module
usr/lib/grub/i386-pc/linux.mod
@@ -256,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image
usr/lib/grub/i386-pc/lzma_decompress.img
usr/lib/grub/i386-pc/lzopio.mod
usr/lib/grub/i386-pc/lzopio.module
+usr/lib/grub/i386-pc/macbless.mod
+usr/lib/grub/i386-pc/macbless.module
+usr/lib/grub/i386-pc/macho.mod
+usr/lib/grub/i386-pc/macho.module
+usr/lib/grub/i386-pc/mda_text.mod
+usr/lib/grub/i386-pc/mda_text.module
usr/lib/grub/i386-pc/mdraid09.mod
usr/lib/grub/i386-pc/mdraid09.module
usr/lib/grub/i386-pc/mdraid09_be.mod
@@ -284,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod
usr/lib/grub/i386-pc/mmap.module
usr/lib/grub/i386-pc/moddep.lst
usr/lib/grub/i386-pc/modinfo.sh
+usr/lib/grub/i386-pc/morse.mod
+usr/lib/grub/i386-pc/morse.module
+usr/lib/grub/i386-pc/mpi.mod
+usr/lib/grub/i386-pc/mpi.module
usr/lib/grub/i386-pc/msdospart.mod
usr/lib/grub/i386-pc/msdospart.module
+usr/lib/grub/i386-pc/mul_test.mod
+usr/lib/grub/i386-pc/mul_test.module
usr/lib/grub/i386-pc/multiboot.mod
usr/lib/grub/i386-pc/multiboot.module
usr/lib/grub/i386-pc/multiboot2.mod
usr/lib/grub/i386-pc/multiboot2.module
+usr/lib/grub/i386-pc/nativedisk.mod
+usr/lib/grub/i386-pc/nativedisk.module
usr/lib/grub/i386-pc/net.mod
usr/lib/grub/i386-pc/net.module
usr/lib/grub/i386-pc/newc.mod
@@ -306,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod
usr/lib/grub/i386-pc/ntldr.module
usr/lib/grub/i386-pc/odc.mod
usr/lib/grub/i386-pc/odc.module
+usr/lib/grub/i386-pc/offsetio.mod
+usr/lib/grub/i386-pc/offsetio.module
usr/lib/grub/i386-pc/ohci.mod
usr/lib/grub/i386-pc/ohci.module
usr/lib/grub/i386-pc/part_acorn.mod
@@ -316,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod
usr/lib/grub/i386-pc/part_apple.module
usr/lib/grub/i386-pc/part_bsd.mod
usr/lib/grub/i386-pc/part_bsd.module
+usr/lib/grub/i386-pc/part_dfly.mod
+usr/lib/grub/i386-pc/part_dfly.module
usr/lib/grub/i386-pc/part_dvh.mod
usr/lib/grub/i386-pc/part_dvh.module
usr/lib/grub/i386-pc/part_gpt.mod
@@ -340,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod
usr/lib/grub/i386-pc/pata.module
usr/lib/grub/i386-pc/pbkdf2.mod
usr/lib/grub/i386-pc/pbkdf2.module
+usr/lib/grub/i386-pc/pbkdf2_test.mod
+usr/lib/grub/i386-pc/pbkdf2_test.module
usr/lib/grub/i386-pc/pci.mod
usr/lib/grub/i386-pc/pci.module
+usr/lib/grub/i386-pc/pcidump.mod
+usr/lib/grub/i386-pc/pcidump.module
usr/lib/grub/i386-pc/plan9.mod
usr/lib/grub/i386-pc/plan9.module
usr/lib/grub/i386-pc/play.mod
@@ -352,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod
usr/lib/grub/i386-pc/priority_queue.module
usr/lib/grub/i386-pc/probe.mod
usr/lib/grub/i386-pc/probe.module
+usr/lib/grub/i386-pc/procfs.mod
+usr/lib/grub/i386-pc/procfs.module
+usr/lib/grub/i386-pc/progress.mod
+usr/lib/grub/i386-pc/progress.module
usr/lib/grub/i386-pc/pxe.mod
usr/lib/grub/i386-pc/pxe.module
usr/lib/grub/i386-pc/pxeboot.image
@@ -362,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod
usr/lib/grub/i386-pc/raid5rec.module
usr/lib/grub/i386-pc/raid6rec.mod
usr/lib/grub/i386-pc/raid6rec.module
+usr/lib/grub/i386-pc/random.mod
+usr/lib/grub/i386-pc/random.module
usr/lib/grub/i386-pc/read.mod
usr/lib/grub/i386-pc/read.module
usr/lib/grub/i386-pc/reboot.mod
@@ -390,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod
usr/lib/grub/i386-pc/serial.module
usr/lib/grub/i386-pc/setjmp.mod
usr/lib/grub/i386-pc/setjmp.module
+usr/lib/grub/i386-pc/setjmp_test.mod
+usr/lib/grub/i386-pc/setjmp_test.module
usr/lib/grub/i386-pc/setpci.mod
usr/lib/grub/i386-pc/setpci.module
usr/lib/grub/i386-pc/sfs.mod
usr/lib/grub/i386-pc/sfs.module
+usr/lib/grub/i386-pc/shift_test.mod
+usr/lib/grub/i386-pc/shift_test.module
+usr/lib/grub/i386-pc/signature_test.mod
+usr/lib/grub/i386-pc/signature_test.module
usr/lib/grub/i386-pc/sleep.mod
usr/lib/grub/i386-pc/sleep.module
+usr/lib/grub/i386-pc/sleep_test.mod
+usr/lib/grub/i386-pc/sleep_test.module
+usr/lib/grub/i386-pc/spkmodem.mod
+usr/lib/grub/i386-pc/spkmodem.module
usr/lib/grub/i386-pc/squash4.mod
usr/lib/grub/i386-pc/squash4.module
+usr/lib/grub/i386-pc/syslinuxcfg.mod
+usr/lib/grub/i386-pc/syslinuxcfg.module
usr/lib/grub/i386-pc/tar.mod
usr/lib/grub/i386-pc/tar.module
usr/lib/grub/i386-pc/terminal.lst
@@ -411,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod
usr/lib/grub/i386-pc/test_blockarg.module
usr/lib/grub/i386-pc/testload.mod
usr/lib/grub/i386-pc/testload.module
+usr/lib/grub/i386-pc/testspeed.mod
+usr/lib/grub/i386-pc/testspeed.module
usr/lib/grub/i386-pc/tftp.mod
usr/lib/grub/i386-pc/tftp.module
usr/lib/grub/i386-pc/tga.mod
usr/lib/grub/i386-pc/tga.module
usr/lib/grub/i386-pc/time.mod
usr/lib/grub/i386-pc/time.module
+usr/lib/grub/i386-pc/tr.mod
+usr/lib/grub/i386-pc/tr.module
usr/lib/grub/i386-pc/trig.mod
usr/lib/grub/i386-pc/trig.module
usr/lib/grub/i386-pc/true.mod
usr/lib/grub/i386-pc/true.module
+usr/lib/grub/i386-pc/truecrypt.mod
+usr/lib/grub/i386-pc/truecrypt.module
usr/lib/grub/i386-pc/udf.mod
usr/lib/grub/i386-pc/udf.module
usr/lib/grub/i386-pc/ufs1.mod
usr/lib/grub/i386-pc/ufs1.module
+usr/lib/grub/i386-pc/ufs1_be.mod
+usr/lib/grub/i386-pc/ufs1_be.module
usr/lib/grub/i386-pc/ufs2.mod
usr/lib/grub/i386-pc/ufs2.module
usr/lib/grub/i386-pc/uhci.mod
@@ -441,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod
usr/lib/grub/i386-pc/usbserial_ftdi.module
usr/lib/grub/i386-pc/usbserial_pl2303.mod
usr/lib/grub/i386-pc/usbserial_pl2303.module
+usr/lib/grub/i386-pc/usbserial_usbdebug.mod
+usr/lib/grub/i386-pc/usbserial_usbdebug.module
usr/lib/grub/i386-pc/usbtest.mod
usr/lib/grub/i386-pc/usbtest.module
usr/lib/grub/i386-pc/vbe.mod
usr/lib/grub/i386-pc/vbe.module
+usr/lib/grub/i386-pc/verify.mod
+usr/lib/grub/i386-pc/verify.module
usr/lib/grub/i386-pc/vga.mod
usr/lib/grub/i386-pc/vga.module
usr/lib/grub/i386-pc/vga_text.mod
@@ -456,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod
usr/lib/grub/i386-pc/video_bochs.module
usr/lib/grub/i386-pc/video_cirrus.mod
usr/lib/grub/i386-pc/video_cirrus.module
+usr/lib/grub/i386-pc/video_colors.mod
+usr/lib/grub/i386-pc/video_colors.module
usr/lib/grub/i386-pc/video_fb.mod
usr/lib/grub/i386-pc/video_fb.module
usr/lib/grub/i386-pc/videoinfo.mod
usr/lib/grub/i386-pc/videoinfo.module
usr/lib/grub/i386-pc/videotest.mod
usr/lib/grub/i386-pc/videotest.module
+usr/lib/grub/i386-pc/videotest_checksum.mod
+usr/lib/grub/i386-pc/videotest_checksum.module
usr/lib/grub/i386-pc/xfs.mod
usr/lib/grub/i386-pc/xfs.module
usr/lib/grub/i386-pc/xnu.mod
usr/lib/grub/i386-pc/xnu.module
usr/lib/grub/i386-pc/xnu_uuid.mod
usr/lib/grub/i386-pc/xnu_uuid.module
+usr/lib/grub/i386-pc/xnu_uuid_test.mod
+usr/lib/grub/i386-pc/xnu_uuid_test.module
usr/lib/grub/i386-pc/xzio.mod
usr/lib/grub/i386-pc/xzio.module
usr/lib/grub/i386-pc/zfs.mod
@@ -478,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod
usr/lib/grub/i386-pc/zfsinfo.module
usr/sbin/grub-bios-setup
usr/sbin/grub-install
+usr/sbin/grub-macbless
usr/sbin/grub-mkconfig
-usr/sbin/grub-mknetdir
usr/sbin/grub-ofpathname
usr/sbin/grub-probe
usr/sbin/grub-reboot
@@ -518,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib
#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo
#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo
#usr/share/locale/eo/LC_MESSAGES/grub.mo
+#usr/share/locale/es/LC_MESSAGES/grub.mo
#usr/share/locale/fi/LC_MESSAGES/grub.mo
#usr/share/locale/fr/LC_MESSAGES/grub.mo
+#usr/share/locale/gl/LC_MESSAGES/grub.mo
#usr/share/locale/hu/LC_MESSAGES/grub.mo
#usr/share/locale/id/LC_MESSAGES/grub.mo
#usr/share/locale/it/LC_MESSAGES/grub.mo
#usr/share/locale/ja/LC_MESSAGES/grub.mo
+#usr/share/locale/lt/LC_MESSAGES/grub.mo
+#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo
#usr/share/locale/pa
#usr/share/locale/pa/LC_MESSAGES
#usr/share/locale/pa/LC_MESSAGES/grub.mo
#usr/share/locale/pl/LC_MESSAGES/grub.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
#usr/share/locale/ru/LC_MESSAGES/grub.mo
+#usr/share/locale/sl/LC_MESSAGES/grub.mo
+#usr/share/locale/sr/LC_MESSAGES/grub.mo
#usr/share/locale/sv/LC_MESSAGES/grub.mo
+#usr/share/locale/tr/LC_MESSAGES/grub.mo
#usr/share/locale/uk/LC_MESSAGES/grub.mo
#usr/share/locale/vi/LC_MESSAGES/grub.mo
#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 19aef9b..010b52c 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -15,19 +15,24 @@ etc/grub.d/41_custom
etc/grub.d/README
etc/grub2.cfg
usr/bin/grub-editenv
+usr/bin/grub-file
usr/bin/grub-fstest
+usr/bin/grub-glue-efi
usr/bin/grub-kbdcomp
usr/bin/grub-menulst2cfg
usr/bin/grub-mkfont
usr/bin/grub-mkimage
usr/bin/grub-mklayout
+usr/bin/grub-mknetdir
usr/bin/grub-mkpasswd-pbkdf2
usr/bin/grub-mkrelpath
usr/bin/grub-mkrescue
usr/bin/grub-mkstandalone
+usr/bin/grub-render-label
usr/bin/grub-script-check
-usr/lib/grub
-usr/lib/grub/i386-pc
+usr/bin/grub-syslinux2cfg
+#usr/lib/grub
+#usr/lib/grub/i386-pc
usr/lib/grub/i386-pc/acpi.mod
usr/lib/grub/i386-pc/acpi.module
usr/lib/grub/i386-pc/adler32.mod
@@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod
usr/lib/grub/i386-pc/all_video.module
usr/lib/grub/i386-pc/aout.mod
usr/lib/grub/i386-pc/aout.module
+usr/lib/grub/i386-pc/archelp.mod
+usr/lib/grub/i386-pc/archelp.module
usr/lib/grub/i386-pc/at_keyboard.mod
usr/lib/grub/i386-pc/at_keyboard.module
usr/lib/grub/i386-pc/ata.mod
@@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image
usr/lib/grub/i386-pc/boot.img
usr/lib/grub/i386-pc/boot.mod
usr/lib/grub/i386-pc/boot.module
+usr/lib/grub/i386-pc/boot_hybrid.image
+usr/lib/grub/i386-pc/boot_hybrid.img
usr/lib/grub/i386-pc/bsd.mod
usr/lib/grub/i386-pc/bsd.module
+usr/lib/grub/i386-pc/bswap_test.mod
+usr/lib/grub/i386-pc/bswap_test.module
usr/lib/grub/i386-pc/btrfs.mod
usr/lib/grub/i386-pc/btrfs.module
usr/lib/grub/i386-pc/bufio.mod
usr/lib/grub/i386-pc/bufio.module
usr/lib/grub/i386-pc/cat.mod
usr/lib/grub/i386-pc/cat.module
+usr/lib/grub/i386-pc/cbfs.mod
+usr/lib/grub/i386-pc/cbfs.module
+usr/lib/grub/i386-pc/cbls.mod
+usr/lib/grub/i386-pc/cbls.module
+usr/lib/grub/i386-pc/cbmemc.mod
+usr/lib/grub/i386-pc/cbmemc.module
+usr/lib/grub/i386-pc/cbtable.mod
+usr/lib/grub/i386-pc/cbtable.module
+usr/lib/grub/i386-pc/cbtime.mod
+usr/lib/grub/i386-pc/cbtime.module
usr/lib/grub/i386-pc/cdboot.image
usr/lib/grub/i386-pc/cdboot.img
usr/lib/grub/i386-pc/chain.mod
usr/lib/grub/i386-pc/chain.module
+usr/lib/grub/i386-pc/cmdline_cat_test.mod
+usr/lib/grub/i386-pc/cmdline_cat_test.module
+usr/lib/grub/i386-pc/cmosdump.mod
+usr/lib/grub/i386-pc/cmosdump.module
usr/lib/grub/i386-pc/cmostest.mod
usr/lib/grub/i386-pc/cmostest.module
usr/lib/grub/i386-pc/cmp.mod
usr/lib/grub/i386-pc/cmp.module
+usr/lib/grub/i386-pc/cmp_test.mod
+usr/lib/grub/i386-pc/cmp_test.module
usr/lib/grub/i386-pc/command.lst
usr/lib/grub/i386-pc/config.h
usr/lib/grub/i386-pc/configfile.mod
@@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod
usr/lib/grub/i386-pc/cryptodisk.module
usr/lib/grub/i386-pc/cs5536.mod
usr/lib/grub/i386-pc/cs5536.module
+usr/lib/grub/i386-pc/ctz_test.mod
+usr/lib/grub/i386-pc/ctz_test.module
usr/lib/grub/i386-pc/date.mod
usr/lib/grub/i386-pc/date.module
usr/lib/grub/i386-pc/datehook.mod
usr/lib/grub/i386-pc/datehook.module
usr/lib/grub/i386-pc/datetime.mod
usr/lib/grub/i386-pc/datetime.module
+usr/lib/grub/i386-pc/disk.mod
+usr/lib/grub/i386-pc/disk.module
usr/lib/grub/i386-pc/diskboot.image
usr/lib/grub/i386-pc/diskboot.img
usr/lib/grub/i386-pc/diskfilter.mod
usr/lib/grub/i386-pc/diskfilter.module
+usr/lib/grub/i386-pc/div.mod
+usr/lib/grub/i386-pc/div.module
+usr/lib/grub/i386-pc/div_test.mod
+usr/lib/grub/i386-pc/div_test.module
usr/lib/grub/i386-pc/dm_nv.mod
usr/lib/grub/i386-pc/dm_nv.module
usr/lib/grub/i386-pc/drivemap.mod
@@ -115,12 +150,12 @@ usr/lib/grub/i386-pc/echo.mod
usr/lib/grub/i386-pc/echo.module
usr/lib/grub/i386-pc/efiemu.mod
usr/lib/grub/i386-pc/efiemu.module
-usr/lib/grub/i386-pc/efiemu32.o
-usr/lib/grub/i386-pc/efiemu64.o
usr/lib/grub/i386-pc/ehci.mod
usr/lib/grub/i386-pc/ehci.module
usr/lib/grub/i386-pc/elf.mod
usr/lib/grub/i386-pc/elf.module
+usr/lib/grub/i386-pc/eval.mod
+usr/lib/grub/i386-pc/eval.module
usr/lib/grub/i386-pc/exfat.mod
usr/lib/grub/i386-pc/exfat.module
usr/lib/grub/i386-pc/exfctest.mod
@@ -131,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod
usr/lib/grub/i386-pc/extcmd.module
usr/lib/grub/i386-pc/fat.mod
usr/lib/grub/i386-pc/fat.module
+usr/lib/grub/i386-pc/file.mod
+usr/lib/grub/i386-pc/file.module
usr/lib/grub/i386-pc/font.mod
usr/lib/grub/i386-pc/font.module
usr/lib/grub/i386-pc/freedos.mod
@@ -152,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod
usr/lib/grub/i386-pc/gcry_crc.module
usr/lib/grub/i386-pc/gcry_des.mod
usr/lib/grub/i386-pc/gcry_des.module
+usr/lib/grub/i386-pc/gcry_dsa.mod
+usr/lib/grub/i386-pc/gcry_dsa.module
+usr/lib/grub/i386-pc/gcry_idea.mod
+usr/lib/grub/i386-pc/gcry_idea.module
usr/lib/grub/i386-pc/gcry_md4.mod
usr/lib/grub/i386-pc/gcry_md4.module
usr/lib/grub/i386-pc/gcry_md5.mod
@@ -162,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod
usr/lib/grub/i386-pc/gcry_rijndael.module
usr/lib/grub/i386-pc/gcry_rmd160.mod
usr/lib/grub/i386-pc/gcry_rmd160.module
+usr/lib/grub/i386-pc/gcry_rsa.mod
+usr/lib/grub/i386-pc/gcry_rsa.module
usr/lib/grub/i386-pc/gcry_seed.mod
usr/lib/grub/i386-pc/gcry_seed.module
usr/lib/grub/i386-pc/gcry_serpent.mod
@@ -189,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod
usr/lib/grub/i386-pc/gfxmenu.module
usr/lib/grub/i386-pc/gfxterm.mod
usr/lib/grub/i386-pc/gfxterm.module
+usr/lib/grub/i386-pc/gfxterm_background.mod
+usr/lib/grub/i386-pc/gfxterm_background.module
+usr/lib/grub/i386-pc/gfxterm_menu.mod
+usr/lib/grub/i386-pc/gfxterm_menu.module
usr/lib/grub/i386-pc/gmodule.pl
usr/lib/grub/i386-pc/gptsync.mod
usr/lib/grub/i386-pc/gptsync.module
@@ -210,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod
usr/lib/grub/i386-pc/hfs.module
usr/lib/grub/i386-pc/hfsplus.mod
usr/lib/grub/i386-pc/hfsplus.module
+usr/lib/grub/i386-pc/hfspluscomp.mod
+usr/lib/grub/i386-pc/hfspluscomp.module
usr/lib/grub/i386-pc/http.mod
usr/lib/grub/i386-pc/http.module
usr/lib/grub/i386-pc/iorw.mod
@@ -228,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod
usr/lib/grub/i386-pc/keystatus.module
usr/lib/grub/i386-pc/ldm.mod
usr/lib/grub/i386-pc/ldm.module
+usr/lib/grub/i386-pc/legacy_password_test.mod
+usr/lib/grub/i386-pc/legacy_password_test.module
usr/lib/grub/i386-pc/legacycfg.mod
usr/lib/grub/i386-pc/legacycfg.module
usr/lib/grub/i386-pc/linux.mod
@@ -258,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image
usr/lib/grub/i386-pc/lzma_decompress.img
usr/lib/grub/i386-pc/lzopio.mod
usr/lib/grub/i386-pc/lzopio.module
+usr/lib/grub/i386-pc/macbless.mod
+usr/lib/grub/i386-pc/macbless.module
+usr/lib/grub/i386-pc/macho.mod
+usr/lib/grub/i386-pc/macho.module
+usr/lib/grub/i386-pc/mda_text.mod
+usr/lib/grub/i386-pc/mda_text.module
usr/lib/grub/i386-pc/mdraid09.mod
usr/lib/grub/i386-pc/mdraid09.module
usr/lib/grub/i386-pc/mdraid09_be.mod
@@ -286,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod
usr/lib/grub/i386-pc/mmap.module
usr/lib/grub/i386-pc/moddep.lst
usr/lib/grub/i386-pc/modinfo.sh
+usr/lib/grub/i386-pc/morse.mod
+usr/lib/grub/i386-pc/morse.module
+usr/lib/grub/i386-pc/mpi.mod
+usr/lib/grub/i386-pc/mpi.module
usr/lib/grub/i386-pc/msdospart.mod
usr/lib/grub/i386-pc/msdospart.module
+usr/lib/grub/i386-pc/mul_test.mod
+usr/lib/grub/i386-pc/mul_test.module
usr/lib/grub/i386-pc/multiboot.mod
usr/lib/grub/i386-pc/multiboot.module
usr/lib/grub/i386-pc/multiboot2.mod
usr/lib/grub/i386-pc/multiboot2.module
+usr/lib/grub/i386-pc/nativedisk.mod
+usr/lib/grub/i386-pc/nativedisk.module
usr/lib/grub/i386-pc/net.mod
usr/lib/grub/i386-pc/net.module
usr/lib/grub/i386-pc/newc.mod
@@ -308,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod
usr/lib/grub/i386-pc/ntldr.module
usr/lib/grub/i386-pc/odc.mod
usr/lib/grub/i386-pc/odc.module
+usr/lib/grub/i386-pc/offsetio.mod
+usr/lib/grub/i386-pc/offsetio.module
usr/lib/grub/i386-pc/ohci.mod
usr/lib/grub/i386-pc/ohci.module
usr/lib/grub/i386-pc/part_acorn.mod
@@ -318,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod
usr/lib/grub/i386-pc/part_apple.module
usr/lib/grub/i386-pc/part_bsd.mod
usr/lib/grub/i386-pc/part_bsd.module
+usr/lib/grub/i386-pc/part_dfly.mod
+usr/lib/grub/i386-pc/part_dfly.module
usr/lib/grub/i386-pc/part_dvh.mod
usr/lib/grub/i386-pc/part_dvh.module
usr/lib/grub/i386-pc/part_gpt.mod
@@ -342,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod
usr/lib/grub/i386-pc/pata.module
usr/lib/grub/i386-pc/pbkdf2.mod
usr/lib/grub/i386-pc/pbkdf2.module
+usr/lib/grub/i386-pc/pbkdf2_test.mod
+usr/lib/grub/i386-pc/pbkdf2_test.module
usr/lib/grub/i386-pc/pci.mod
usr/lib/grub/i386-pc/pci.module
+usr/lib/grub/i386-pc/pcidump.mod
+usr/lib/grub/i386-pc/pcidump.module
usr/lib/grub/i386-pc/plan9.mod
usr/lib/grub/i386-pc/plan9.module
usr/lib/grub/i386-pc/play.mod
@@ -354,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod
usr/lib/grub/i386-pc/priority_queue.module
usr/lib/grub/i386-pc/probe.mod
usr/lib/grub/i386-pc/probe.module
+usr/lib/grub/i386-pc/procfs.mod
+usr/lib/grub/i386-pc/procfs.module
+usr/lib/grub/i386-pc/progress.mod
+usr/lib/grub/i386-pc/progress.module
usr/lib/grub/i386-pc/pxe.mod
usr/lib/grub/i386-pc/pxe.module
usr/lib/grub/i386-pc/pxeboot.image
@@ -364,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod
usr/lib/grub/i386-pc/raid5rec.module
usr/lib/grub/i386-pc/raid6rec.mod
usr/lib/grub/i386-pc/raid6rec.module
+usr/lib/grub/i386-pc/random.mod
+usr/lib/grub/i386-pc/random.module
usr/lib/grub/i386-pc/read.mod
usr/lib/grub/i386-pc/read.module
usr/lib/grub/i386-pc/reboot.mod
@@ -392,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod
usr/lib/grub/i386-pc/serial.module
usr/lib/grub/i386-pc/setjmp.mod
usr/lib/grub/i386-pc/setjmp.module
+usr/lib/grub/i386-pc/setjmp_test.mod
+usr/lib/grub/i386-pc/setjmp_test.module
usr/lib/grub/i386-pc/setpci.mod
usr/lib/grub/i386-pc/setpci.module
usr/lib/grub/i386-pc/sfs.mod
usr/lib/grub/i386-pc/sfs.module
+usr/lib/grub/i386-pc/shift_test.mod
+usr/lib/grub/i386-pc/shift_test.module
+usr/lib/grub/i386-pc/signature_test.mod
+usr/lib/grub/i386-pc/signature_test.module
usr/lib/grub/i386-pc/sleep.mod
usr/lib/grub/i386-pc/sleep.module
+usr/lib/grub/i386-pc/sleep_test.mod
+usr/lib/grub/i386-pc/sleep_test.module
+usr/lib/grub/i386-pc/spkmodem.mod
+usr/lib/grub/i386-pc/spkmodem.module
usr/lib/grub/i386-pc/squash4.mod
usr/lib/grub/i386-pc/squash4.module
+usr/lib/grub/i386-pc/syslinuxcfg.mod
+usr/lib/grub/i386-pc/syslinuxcfg.module
usr/lib/grub/i386-pc/tar.mod
usr/lib/grub/i386-pc/tar.module
usr/lib/grub/i386-pc/terminal.lst
@@ -413,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod
usr/lib/grub/i386-pc/test_blockarg.module
usr/lib/grub/i386-pc/testload.mod
usr/lib/grub/i386-pc/testload.module
+usr/lib/grub/i386-pc/testspeed.mod
+usr/lib/grub/i386-pc/testspeed.module
usr/lib/grub/i386-pc/tftp.mod
usr/lib/grub/i386-pc/tftp.module
usr/lib/grub/i386-pc/tga.mod
usr/lib/grub/i386-pc/tga.module
usr/lib/grub/i386-pc/time.mod
usr/lib/grub/i386-pc/time.module
+usr/lib/grub/i386-pc/tr.mod
+usr/lib/grub/i386-pc/tr.module
usr/lib/grub/i386-pc/trig.mod
usr/lib/grub/i386-pc/trig.module
usr/lib/grub/i386-pc/true.mod
usr/lib/grub/i386-pc/true.module
+usr/lib/grub/i386-pc/truecrypt.mod
+usr/lib/grub/i386-pc/truecrypt.module
usr/lib/grub/i386-pc/udf.mod
usr/lib/grub/i386-pc/udf.module
usr/lib/grub/i386-pc/ufs1.mod
usr/lib/grub/i386-pc/ufs1.module
+usr/lib/grub/i386-pc/ufs1_be.mod
+usr/lib/grub/i386-pc/ufs1_be.module
usr/lib/grub/i386-pc/ufs2.mod
usr/lib/grub/i386-pc/ufs2.module
usr/lib/grub/i386-pc/uhci.mod
@@ -443,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod
usr/lib/grub/i386-pc/usbserial_ftdi.module
usr/lib/grub/i386-pc/usbserial_pl2303.mod
usr/lib/grub/i386-pc/usbserial_pl2303.module
+usr/lib/grub/i386-pc/usbserial_usbdebug.mod
+usr/lib/grub/i386-pc/usbserial_usbdebug.module
usr/lib/grub/i386-pc/usbtest.mod
usr/lib/grub/i386-pc/usbtest.module
usr/lib/grub/i386-pc/vbe.mod
usr/lib/grub/i386-pc/vbe.module
+usr/lib/grub/i386-pc/verify.mod
+usr/lib/grub/i386-pc/verify.module
usr/lib/grub/i386-pc/vga.mod
usr/lib/grub/i386-pc/vga.module
usr/lib/grub/i386-pc/vga_text.mod
@@ -458,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod
usr/lib/grub/i386-pc/video_bochs.module
usr/lib/grub/i386-pc/video_cirrus.mod
usr/lib/grub/i386-pc/video_cirrus.module
+usr/lib/grub/i386-pc/video_colors.mod
+usr/lib/grub/i386-pc/video_colors.module
usr/lib/grub/i386-pc/video_fb.mod
usr/lib/grub/i386-pc/video_fb.module
usr/lib/grub/i386-pc/videoinfo.mod
usr/lib/grub/i386-pc/videoinfo.module
usr/lib/grub/i386-pc/videotest.mod
usr/lib/grub/i386-pc/videotest.module
+usr/lib/grub/i386-pc/videotest_checksum.mod
+usr/lib/grub/i386-pc/videotest_checksum.module
usr/lib/grub/i386-pc/xfs.mod
usr/lib/grub/i386-pc/xfs.module
usr/lib/grub/i386-pc/xnu.mod
usr/lib/grub/i386-pc/xnu.module
usr/lib/grub/i386-pc/xnu_uuid.mod
usr/lib/grub/i386-pc/xnu_uuid.module
+usr/lib/grub/i386-pc/xnu_uuid_test.mod
+usr/lib/grub/i386-pc/xnu_uuid_test.module
usr/lib/grub/i386-pc/xzio.mod
usr/lib/grub/i386-pc/xzio.module
usr/lib/grub/i386-pc/zfs.mod
@@ -480,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod
usr/lib/grub/i386-pc/zfsinfo.module
usr/sbin/grub-bios-setup
usr/sbin/grub-install
+usr/sbin/grub-macbless
usr/sbin/grub-mkconfig
-usr/sbin/grub-mknetdir
usr/sbin/grub-ofpathname
usr/sbin/grub-probe
usr/sbin/grub-reboot
@@ -520,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib
#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo
#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo
#usr/share/locale/eo/LC_MESSAGES/grub.mo
+#usr/share/locale/es/LC_MESSAGES/grub.mo
#usr/share/locale/fi/LC_MESSAGES/grub.mo
#usr/share/locale/fr/LC_MESSAGES/grub.mo
+#usr/share/locale/gl/LC_MESSAGES/grub.mo
#usr/share/locale/hu/LC_MESSAGES/grub.mo
#usr/share/locale/id/LC_MESSAGES/grub.mo
#usr/share/locale/it/LC_MESSAGES/grub.mo
#usr/share/locale/ja/LC_MESSAGES/grub.mo
+#usr/share/locale/lt/LC_MESSAGES/grub.mo
+#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo
#usr/share/locale/pa
#usr/share/locale/pa/LC_MESSAGES
#usr/share/locale/pa/LC_MESSAGES/grub.mo
#usr/share/locale/pl/LC_MESSAGES/grub.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
#usr/share/locale/ru/LC_MESSAGES/grub.mo
+#usr/share/locale/sl/LC_MESSAGES/grub.mo
+#usr/share/locale/sr/LC_MESSAGES/grub.mo
#usr/share/locale/sv/LC_MESSAGES/grub.mo
+#usr/share/locale/tr/LC_MESSAGES/grub.mo
#usr/share/locale/uk/LC_MESSAGES/grub.mo
#usr/share/locale/vi/LC_MESSAGES/grub.mo
#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
diff --git a/lfs/flash-images b/lfs/flash-images
index d10fc9b..c95dbd9 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -193,7 +193,7 @@ endif
-e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
# Install GRUB
- grub-install --force --recheck --no-floppy \
+ grub-install --force --recheck --no-floppy --directory /usr/lib/grub/i386-pc \
--root-directory=$(MNThdd) $(DEVICE)
endif
diff --git a/lfs/grub b/lfs/grub
index ba74408..e4359b7 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.00
+VER = 2.02~beta3
THISAPP = grub-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -41,13 +41,13 @@ CXXFLAGS =
###############################################################################
objects = $(DL_FILE) \
- unifont-7.0.03.pcf.gz
+ unifont-9.0.02.pcf.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
+unifont-9.0.02.pcf.gz = $(DL_FROM)/unifont-9.0.02.pcf.gz
-$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91
-unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
+$(DL_FILE)_MD5 = ab399fc6f74a97d66ff77f04b743149c
+unifont-9.0.02.pcf.gz_MD5 = 8819d828361a6b70dcac793c1ec235bb
install : $(TARGET)
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch
cd $(DIR_APP) && \
./configure \
@@ -85,6 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir=/etc \
--with-platform=pc \
--with-grubdir=grub \
+ --disable-efiemu \
+ --disable-grub-emu-usb \
--program-transform-name=s,grub,grub, \
--disable-grub-mount \
--disable-werror
@@ -100,15 +101,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
# Disable hardening.
- paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
- paxctl -mpexs /usr/bin/grub-script-check
+ paxctl -mpesc /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
# We don't need to install unifont just to generate a grub2 compatible
# font archive for the graphical boot menu. The following command only
# converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters.
/usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
--range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
- $(DIR_DL)/unifont-7.0.03.pcf.gz
+ $(DIR_DL)/unifont-9.0.02.pcf.gz
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/grub-2.00_disable_vga_fallback.patch b/src/patches/grub-2.00_disable_vga_fallback.patch
deleted file mode 100644
index 0d1dec9..0000000
--- a/src/patches/grub-2.00_disable_vga_fallback.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-We have to remove the vga fallback because this not work on bay-trail and other
-new intel onboard graphics.
-
-diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-core/video/i386/pc/vga.c
---- grub-2.00.org/grub-core/video/i386/pc/vga.c 2012-06-06 23:21:02.000000000 +0200
-+++ grub-2.00/grub-core/video/i386/pc/vga.c 2014-09-05 21:41:04.790870375 +0200
-@@ -122,7 +122,7 @@
- {
- grub_err_t err;
-
-- if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
-+// if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
- return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
-
- framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH);
--
2.9.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] grub: update 2.02~beta3 v2
2016-09-03 7:15 [PATCH] grub: update 2.02~beta3 v2 Marcel Lorenz
@ 2016-09-26 19:13 ` Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2016-09-26 19:13 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 38640 bytes --]
Hi,
On Sat, 2016-09-03 at 09:15 +0200, Marcel Lorenz wrote:
> The IPfire's screen resulution is changed from 640x480 to 1280x800
> with fallback to 1024x786. Better for restore IPFire with network problems
I can only reject this patch for this change.
We cannot assume that any of these resolutions is supported and GRUB was able to
auto-detect a good (and supported!) resolution in the current release that we
ship.
> The lfs/flash-images is updated to fix build fail
> The "disable VGA fallback" patch is not more needed and removed
Why was this dropped? Please provide a reason with your commit message.
>
> The Unifont is updated to 9.0.02
Best,
-Michael
>
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> ---
> config/grub2/default | 1 +
> config/rootfiles/common/i586/grub | 125 +++++++++++++++++++++-
> config/rootfiles/common/x86_64/grub | 127
> ++++++++++++++++++++++-
> lfs/flash-images | 2 +-
> lfs/grub | 20 ++--
> src/patches/grub-2.00_disable_vga_fallback.patch | 15 ---
> 6 files changed, 256 insertions(+), 34 deletions(-)
> delete mode 100644 src/patches/grub-2.00_disable_vga_fallback.patch
>
> diff --git a/config/grub2/default b/config/grub2/default
> index 39eed0f..4139e9c 100644
> --- a/config/grub2/default
> +++ b/config/grub2/default
> @@ -5,3 +5,4 @@ GRUB_CMDLINE_LINUX="panic=10"
> GRUB_DISABLE_RECOVERY="true"
> GRUB_BACKGROUND="/boot/grub/splash.png"
> GRUB_FONT="/boot/grub/unifont.pf2"
> +GRUB_GFXMODE=1280x800,1024x768
> diff --git a/config/rootfiles/common/i586/grub
> b/config/rootfiles/common/i586/grub
> index 9d71942..010b52c 100644
> --- a/config/rootfiles/common/i586/grub
> +++ b/config/rootfiles/common/i586/grub
> @@ -15,19 +15,24 @@ etc/grub.d/41_custom
> etc/grub.d/README
> etc/grub2.cfg
> usr/bin/grub-editenv
> +usr/bin/grub-file
> usr/bin/grub-fstest
> +usr/bin/grub-glue-efi
> usr/bin/grub-kbdcomp
> usr/bin/grub-menulst2cfg
> usr/bin/grub-mkfont
> usr/bin/grub-mkimage
> usr/bin/grub-mklayout
> +usr/bin/grub-mknetdir
> usr/bin/grub-mkpasswd-pbkdf2
> usr/bin/grub-mkrelpath
> usr/bin/grub-mkrescue
> usr/bin/grub-mkstandalone
> +usr/bin/grub-render-label
> usr/bin/grub-script-check
> -usr/lib/grub
> -usr/lib/grub/i386-pc
> +usr/bin/grub-syslinux2cfg
> +#usr/lib/grub
> +#usr/lib/grub/i386-pc
> usr/lib/grub/i386-pc/acpi.mod
> usr/lib/grub/i386-pc/acpi.module
> usr/lib/grub/i386-pc/adler32.mod
> @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod
> usr/lib/grub/i386-pc/all_video.module
> usr/lib/grub/i386-pc/aout.mod
> usr/lib/grub/i386-pc/aout.module
> +usr/lib/grub/i386-pc/archelp.mod
> +usr/lib/grub/i386-pc/archelp.module
> usr/lib/grub/i386-pc/at_keyboard.mod
> usr/lib/grub/i386-pc/at_keyboard.module
> usr/lib/grub/i386-pc/ata.mod
> @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image
> usr/lib/grub/i386-pc/boot.img
> usr/lib/grub/i386-pc/boot.mod
> usr/lib/grub/i386-pc/boot.module
> +usr/lib/grub/i386-pc/boot_hybrid.image
> +usr/lib/grub/i386-pc/boot_hybrid.img
> usr/lib/grub/i386-pc/bsd.mod
> usr/lib/grub/i386-pc/bsd.module
> +usr/lib/grub/i386-pc/bswap_test.mod
> +usr/lib/grub/i386-pc/bswap_test.module
> usr/lib/grub/i386-pc/btrfs.mod
> usr/lib/grub/i386-pc/btrfs.module
> usr/lib/grub/i386-pc/bufio.mod
> usr/lib/grub/i386-pc/bufio.module
> usr/lib/grub/i386-pc/cat.mod
> usr/lib/grub/i386-pc/cat.module
> +usr/lib/grub/i386-pc/cbfs.mod
> +usr/lib/grub/i386-pc/cbfs.module
> +usr/lib/grub/i386-pc/cbls.mod
> +usr/lib/grub/i386-pc/cbls.module
> +usr/lib/grub/i386-pc/cbmemc.mod
> +usr/lib/grub/i386-pc/cbmemc.module
> +usr/lib/grub/i386-pc/cbtable.mod
> +usr/lib/grub/i386-pc/cbtable.module
> +usr/lib/grub/i386-pc/cbtime.mod
> +usr/lib/grub/i386-pc/cbtime.module
> usr/lib/grub/i386-pc/cdboot.image
> usr/lib/grub/i386-pc/cdboot.img
> usr/lib/grub/i386-pc/chain.mod
> usr/lib/grub/i386-pc/chain.module
> +usr/lib/grub/i386-pc/cmdline_cat_test.mod
> +usr/lib/grub/i386-pc/cmdline_cat_test.module
> +usr/lib/grub/i386-pc/cmosdump.mod
> +usr/lib/grub/i386-pc/cmosdump.module
> usr/lib/grub/i386-pc/cmostest.mod
> usr/lib/grub/i386-pc/cmostest.module
> usr/lib/grub/i386-pc/cmp.mod
> usr/lib/grub/i386-pc/cmp.module
> +usr/lib/grub/i386-pc/cmp_test.mod
> +usr/lib/grub/i386-pc/cmp_test.module
> usr/lib/grub/i386-pc/command.lst
> usr/lib/grub/i386-pc/config.h
> usr/lib/grub/i386-pc/configfile.mod
> @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod
> usr/lib/grub/i386-pc/cryptodisk.module
> usr/lib/grub/i386-pc/cs5536.mod
> usr/lib/grub/i386-pc/cs5536.module
> +usr/lib/grub/i386-pc/ctz_test.mod
> +usr/lib/grub/i386-pc/ctz_test.module
> usr/lib/grub/i386-pc/date.mod
> usr/lib/grub/i386-pc/date.module
> usr/lib/grub/i386-pc/datehook.mod
> usr/lib/grub/i386-pc/datehook.module
> usr/lib/grub/i386-pc/datetime.mod
> usr/lib/grub/i386-pc/datetime.module
> +usr/lib/grub/i386-pc/disk.mod
> +usr/lib/grub/i386-pc/disk.module
> usr/lib/grub/i386-pc/diskboot.image
> usr/lib/grub/i386-pc/diskboot.img
> usr/lib/grub/i386-pc/diskfilter.mod
> usr/lib/grub/i386-pc/diskfilter.module
> +usr/lib/grub/i386-pc/div.mod
> +usr/lib/grub/i386-pc/div.module
> +usr/lib/grub/i386-pc/div_test.mod
> +usr/lib/grub/i386-pc/div_test.module
> usr/lib/grub/i386-pc/dm_nv.mod
> usr/lib/grub/i386-pc/dm_nv.module
> usr/lib/grub/i386-pc/drivemap.mod
> @@ -119,6 +154,8 @@ usr/lib/grub/i386-pc/ehci.mod
> usr/lib/grub/i386-pc/ehci.module
> usr/lib/grub/i386-pc/elf.mod
> usr/lib/grub/i386-pc/elf.module
> +usr/lib/grub/i386-pc/eval.mod
> +usr/lib/grub/i386-pc/eval.module
> usr/lib/grub/i386-pc/exfat.mod
> usr/lib/grub/i386-pc/exfat.module
> usr/lib/grub/i386-pc/exfctest.mod
> @@ -129,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod
> usr/lib/grub/i386-pc/extcmd.module
> usr/lib/grub/i386-pc/fat.mod
> usr/lib/grub/i386-pc/fat.module
> +usr/lib/grub/i386-pc/file.mod
> +usr/lib/grub/i386-pc/file.module
> usr/lib/grub/i386-pc/font.mod
> usr/lib/grub/i386-pc/font.module
> usr/lib/grub/i386-pc/freedos.mod
> @@ -150,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod
> usr/lib/grub/i386-pc/gcry_crc.module
> usr/lib/grub/i386-pc/gcry_des.mod
> usr/lib/grub/i386-pc/gcry_des.module
> +usr/lib/grub/i386-pc/gcry_dsa.mod
> +usr/lib/grub/i386-pc/gcry_dsa.module
> +usr/lib/grub/i386-pc/gcry_idea.mod
> +usr/lib/grub/i386-pc/gcry_idea.module
> usr/lib/grub/i386-pc/gcry_md4.mod
> usr/lib/grub/i386-pc/gcry_md4.module
> usr/lib/grub/i386-pc/gcry_md5.mod
> @@ -160,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod
> usr/lib/grub/i386-pc/gcry_rijndael.module
> usr/lib/grub/i386-pc/gcry_rmd160.mod
> usr/lib/grub/i386-pc/gcry_rmd160.module
> +usr/lib/grub/i386-pc/gcry_rsa.mod
> +usr/lib/grub/i386-pc/gcry_rsa.module
> usr/lib/grub/i386-pc/gcry_seed.mod
> usr/lib/grub/i386-pc/gcry_seed.module
> usr/lib/grub/i386-pc/gcry_serpent.mod
> @@ -187,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod
> usr/lib/grub/i386-pc/gfxmenu.module
> usr/lib/grub/i386-pc/gfxterm.mod
> usr/lib/grub/i386-pc/gfxterm.module
> +usr/lib/grub/i386-pc/gfxterm_background.mod
> +usr/lib/grub/i386-pc/gfxterm_background.module
> +usr/lib/grub/i386-pc/gfxterm_menu.mod
> +usr/lib/grub/i386-pc/gfxterm_menu.module
> usr/lib/grub/i386-pc/gmodule.pl
> usr/lib/grub/i386-pc/gptsync.mod
> usr/lib/grub/i386-pc/gptsync.module
> @@ -208,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod
> usr/lib/grub/i386-pc/hfs.module
> usr/lib/grub/i386-pc/hfsplus.mod
> usr/lib/grub/i386-pc/hfsplus.module
> +usr/lib/grub/i386-pc/hfspluscomp.mod
> +usr/lib/grub/i386-pc/hfspluscomp.module
> usr/lib/grub/i386-pc/http.mod
> usr/lib/grub/i386-pc/http.module
> usr/lib/grub/i386-pc/iorw.mod
> @@ -226,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod
> usr/lib/grub/i386-pc/keystatus.module
> usr/lib/grub/i386-pc/ldm.mod
> usr/lib/grub/i386-pc/ldm.module
> +usr/lib/grub/i386-pc/legacy_password_test.mod
> +usr/lib/grub/i386-pc/legacy_password_test.module
> usr/lib/grub/i386-pc/legacycfg.mod
> usr/lib/grub/i386-pc/legacycfg.module
> usr/lib/grub/i386-pc/linux.mod
> @@ -256,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image
> usr/lib/grub/i386-pc/lzma_decompress.img
> usr/lib/grub/i386-pc/lzopio.mod
> usr/lib/grub/i386-pc/lzopio.module
> +usr/lib/grub/i386-pc/macbless.mod
> +usr/lib/grub/i386-pc/macbless.module
> +usr/lib/grub/i386-pc/macho.mod
> +usr/lib/grub/i386-pc/macho.module
> +usr/lib/grub/i386-pc/mda_text.mod
> +usr/lib/grub/i386-pc/mda_text.module
> usr/lib/grub/i386-pc/mdraid09.mod
> usr/lib/grub/i386-pc/mdraid09.module
> usr/lib/grub/i386-pc/mdraid09_be.mod
> @@ -284,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod
> usr/lib/grub/i386-pc/mmap.module
> usr/lib/grub/i386-pc/moddep.lst
> usr/lib/grub/i386-pc/modinfo.sh
> +usr/lib/grub/i386-pc/morse.mod
> +usr/lib/grub/i386-pc/morse.module
> +usr/lib/grub/i386-pc/mpi.mod
> +usr/lib/grub/i386-pc/mpi.module
> usr/lib/grub/i386-pc/msdospart.mod
> usr/lib/grub/i386-pc/msdospart.module
> +usr/lib/grub/i386-pc/mul_test.mod
> +usr/lib/grub/i386-pc/mul_test.module
> usr/lib/grub/i386-pc/multiboot.mod
> usr/lib/grub/i386-pc/multiboot.module
> usr/lib/grub/i386-pc/multiboot2.mod
> usr/lib/grub/i386-pc/multiboot2.module
> +usr/lib/grub/i386-pc/nativedisk.mod
> +usr/lib/grub/i386-pc/nativedisk.module
> usr/lib/grub/i386-pc/net.mod
> usr/lib/grub/i386-pc/net.module
> usr/lib/grub/i386-pc/newc.mod
> @@ -306,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod
> usr/lib/grub/i386-pc/ntldr.module
> usr/lib/grub/i386-pc/odc.mod
> usr/lib/grub/i386-pc/odc.module
> +usr/lib/grub/i386-pc/offsetio.mod
> +usr/lib/grub/i386-pc/offsetio.module
> usr/lib/grub/i386-pc/ohci.mod
> usr/lib/grub/i386-pc/ohci.module
> usr/lib/grub/i386-pc/part_acorn.mod
> @@ -316,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod
> usr/lib/grub/i386-pc/part_apple.module
> usr/lib/grub/i386-pc/part_bsd.mod
> usr/lib/grub/i386-pc/part_bsd.module
> +usr/lib/grub/i386-pc/part_dfly.mod
> +usr/lib/grub/i386-pc/part_dfly.module
> usr/lib/grub/i386-pc/part_dvh.mod
> usr/lib/grub/i386-pc/part_dvh.module
> usr/lib/grub/i386-pc/part_gpt.mod
> @@ -340,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod
> usr/lib/grub/i386-pc/pata.module
> usr/lib/grub/i386-pc/pbkdf2.mod
> usr/lib/grub/i386-pc/pbkdf2.module
> +usr/lib/grub/i386-pc/pbkdf2_test.mod
> +usr/lib/grub/i386-pc/pbkdf2_test.module
> usr/lib/grub/i386-pc/pci.mod
> usr/lib/grub/i386-pc/pci.module
> +usr/lib/grub/i386-pc/pcidump.mod
> +usr/lib/grub/i386-pc/pcidump.module
> usr/lib/grub/i386-pc/plan9.mod
> usr/lib/grub/i386-pc/plan9.module
> usr/lib/grub/i386-pc/play.mod
> @@ -352,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod
> usr/lib/grub/i386-pc/priority_queue.module
> usr/lib/grub/i386-pc/probe.mod
> usr/lib/grub/i386-pc/probe.module
> +usr/lib/grub/i386-pc/procfs.mod
> +usr/lib/grub/i386-pc/procfs.module
> +usr/lib/grub/i386-pc/progress.mod
> +usr/lib/grub/i386-pc/progress.module
> usr/lib/grub/i386-pc/pxe.mod
> usr/lib/grub/i386-pc/pxe.module
> usr/lib/grub/i386-pc/pxeboot.image
> @@ -362,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod
> usr/lib/grub/i386-pc/raid5rec.module
> usr/lib/grub/i386-pc/raid6rec.mod
> usr/lib/grub/i386-pc/raid6rec.module
> +usr/lib/grub/i386-pc/random.mod
> +usr/lib/grub/i386-pc/random.module
> usr/lib/grub/i386-pc/read.mod
> usr/lib/grub/i386-pc/read.module
> usr/lib/grub/i386-pc/reboot.mod
> @@ -390,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod
> usr/lib/grub/i386-pc/serial.module
> usr/lib/grub/i386-pc/setjmp.mod
> usr/lib/grub/i386-pc/setjmp.module
> +usr/lib/grub/i386-pc/setjmp_test.mod
> +usr/lib/grub/i386-pc/setjmp_test.module
> usr/lib/grub/i386-pc/setpci.mod
> usr/lib/grub/i386-pc/setpci.module
> usr/lib/grub/i386-pc/sfs.mod
> usr/lib/grub/i386-pc/sfs.module
> +usr/lib/grub/i386-pc/shift_test.mod
> +usr/lib/grub/i386-pc/shift_test.module
> +usr/lib/grub/i386-pc/signature_test.mod
> +usr/lib/grub/i386-pc/signature_test.module
> usr/lib/grub/i386-pc/sleep.mod
> usr/lib/grub/i386-pc/sleep.module
> +usr/lib/grub/i386-pc/sleep_test.mod
> +usr/lib/grub/i386-pc/sleep_test.module
> +usr/lib/grub/i386-pc/spkmodem.mod
> +usr/lib/grub/i386-pc/spkmodem.module
> usr/lib/grub/i386-pc/squash4.mod
> usr/lib/grub/i386-pc/squash4.module
> +usr/lib/grub/i386-pc/syslinuxcfg.mod
> +usr/lib/grub/i386-pc/syslinuxcfg.module
> usr/lib/grub/i386-pc/tar.mod
> usr/lib/grub/i386-pc/tar.module
> usr/lib/grub/i386-pc/terminal.lst
> @@ -411,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod
> usr/lib/grub/i386-pc/test_blockarg.module
> usr/lib/grub/i386-pc/testload.mod
> usr/lib/grub/i386-pc/testload.module
> +usr/lib/grub/i386-pc/testspeed.mod
> +usr/lib/grub/i386-pc/testspeed.module
> usr/lib/grub/i386-pc/tftp.mod
> usr/lib/grub/i386-pc/tftp.module
> usr/lib/grub/i386-pc/tga.mod
> usr/lib/grub/i386-pc/tga.module
> usr/lib/grub/i386-pc/time.mod
> usr/lib/grub/i386-pc/time.module
> +usr/lib/grub/i386-pc/tr.mod
> +usr/lib/grub/i386-pc/tr.module
> usr/lib/grub/i386-pc/trig.mod
> usr/lib/grub/i386-pc/trig.module
> usr/lib/grub/i386-pc/true.mod
> usr/lib/grub/i386-pc/true.module
> +usr/lib/grub/i386-pc/truecrypt.mod
> +usr/lib/grub/i386-pc/truecrypt.module
> usr/lib/grub/i386-pc/udf.mod
> usr/lib/grub/i386-pc/udf.module
> usr/lib/grub/i386-pc/ufs1.mod
> usr/lib/grub/i386-pc/ufs1.module
> +usr/lib/grub/i386-pc/ufs1_be.mod
> +usr/lib/grub/i386-pc/ufs1_be.module
> usr/lib/grub/i386-pc/ufs2.mod
> usr/lib/grub/i386-pc/ufs2.module
> usr/lib/grub/i386-pc/uhci.mod
> @@ -441,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod
> usr/lib/grub/i386-pc/usbserial_ftdi.module
> usr/lib/grub/i386-pc/usbserial_pl2303.mod
> usr/lib/grub/i386-pc/usbserial_pl2303.module
> +usr/lib/grub/i386-pc/usbserial_usbdebug.mod
> +usr/lib/grub/i386-pc/usbserial_usbdebug.module
> usr/lib/grub/i386-pc/usbtest.mod
> usr/lib/grub/i386-pc/usbtest.module
> usr/lib/grub/i386-pc/vbe.mod
> usr/lib/grub/i386-pc/vbe.module
> +usr/lib/grub/i386-pc/verify.mod
> +usr/lib/grub/i386-pc/verify.module
> usr/lib/grub/i386-pc/vga.mod
> usr/lib/grub/i386-pc/vga.module
> usr/lib/grub/i386-pc/vga_text.mod
> @@ -456,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod
> usr/lib/grub/i386-pc/video_bochs.module
> usr/lib/grub/i386-pc/video_cirrus.mod
> usr/lib/grub/i386-pc/video_cirrus.module
> +usr/lib/grub/i386-pc/video_colors.mod
> +usr/lib/grub/i386-pc/video_colors.module
> usr/lib/grub/i386-pc/video_fb.mod
> usr/lib/grub/i386-pc/video_fb.module
> usr/lib/grub/i386-pc/videoinfo.mod
> usr/lib/grub/i386-pc/videoinfo.module
> usr/lib/grub/i386-pc/videotest.mod
> usr/lib/grub/i386-pc/videotest.module
> +usr/lib/grub/i386-pc/videotest_checksum.mod
> +usr/lib/grub/i386-pc/videotest_checksum.module
> usr/lib/grub/i386-pc/xfs.mod
> usr/lib/grub/i386-pc/xfs.module
> usr/lib/grub/i386-pc/xnu.mod
> usr/lib/grub/i386-pc/xnu.module
> usr/lib/grub/i386-pc/xnu_uuid.mod
> usr/lib/grub/i386-pc/xnu_uuid.module
> +usr/lib/grub/i386-pc/xnu_uuid_test.mod
> +usr/lib/grub/i386-pc/xnu_uuid_test.module
> usr/lib/grub/i386-pc/xzio.mod
> usr/lib/grub/i386-pc/xzio.module
> usr/lib/grub/i386-pc/zfs.mod
> @@ -478,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod
> usr/lib/grub/i386-pc/zfsinfo.module
> usr/sbin/grub-bios-setup
> usr/sbin/grub-install
> +usr/sbin/grub-macbless
> usr/sbin/grub-mkconfig
> -usr/sbin/grub-mknetdir
> usr/sbin/grub-ofpathname
> usr/sbin/grub-probe
> usr/sbin/grub-reboot
> @@ -518,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib
> #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo
> #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo
> #usr/share/locale/eo/LC_MESSAGES/grub.mo
> +#usr/share/locale/es/LC_MESSAGES/grub.mo
> #usr/share/locale/fi/LC_MESSAGES/grub.mo
> #usr/share/locale/fr/LC_MESSAGES/grub.mo
> +#usr/share/locale/gl/LC_MESSAGES/grub.mo
> #usr/share/locale/hu/LC_MESSAGES/grub.mo
> #usr/share/locale/id/LC_MESSAGES/grub.mo
> #usr/share/locale/it/LC_MESSAGES/grub.mo
> #usr/share/locale/ja/LC_MESSAGES/grub.mo
> +#usr/share/locale/lt/LC_MESSAGES/grub.mo
> +#usr/share/locale/nb/LC_MESSAGES/grub.mo
> #usr/share/locale/nl/LC_MESSAGES/grub.mo
> #usr/share/locale/pa
> #usr/share/locale/pa/LC_MESSAGES
> #usr/share/locale/pa/LC_MESSAGES/grub.mo
> #usr/share/locale/pl/LC_MESSAGES/grub.mo
> +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
> #usr/share/locale/ru/LC_MESSAGES/grub.mo
> +#usr/share/locale/sl/LC_MESSAGES/grub.mo
> +#usr/share/locale/sr/LC_MESSAGES/grub.mo
> #usr/share/locale/sv/LC_MESSAGES/grub.mo
> +#usr/share/locale/tr/LC_MESSAGES/grub.mo
> #usr/share/locale/uk/LC_MESSAGES/grub.mo
> #usr/share/locale/vi/LC_MESSAGES/grub.mo
> #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
> diff --git a/config/rootfiles/common/x86_64/grub
> b/config/rootfiles/common/x86_64/grub
> index 19aef9b..010b52c 100644
> --- a/config/rootfiles/common/x86_64/grub
> +++ b/config/rootfiles/common/x86_64/grub
> @@ -15,19 +15,24 @@ etc/grub.d/41_custom
> etc/grub.d/README
> etc/grub2.cfg
> usr/bin/grub-editenv
> +usr/bin/grub-file
> usr/bin/grub-fstest
> +usr/bin/grub-glue-efi
> usr/bin/grub-kbdcomp
> usr/bin/grub-menulst2cfg
> usr/bin/grub-mkfont
> usr/bin/grub-mkimage
> usr/bin/grub-mklayout
> +usr/bin/grub-mknetdir
> usr/bin/grub-mkpasswd-pbkdf2
> usr/bin/grub-mkrelpath
> usr/bin/grub-mkrescue
> usr/bin/grub-mkstandalone
> +usr/bin/grub-render-label
> usr/bin/grub-script-check
> -usr/lib/grub
> -usr/lib/grub/i386-pc
> +usr/bin/grub-syslinux2cfg
> +#usr/lib/grub
> +#usr/lib/grub/i386-pc
> usr/lib/grub/i386-pc/acpi.mod
> usr/lib/grub/i386-pc/acpi.module
> usr/lib/grub/i386-pc/adler32.mod
> @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod
> usr/lib/grub/i386-pc/all_video.module
> usr/lib/grub/i386-pc/aout.mod
> usr/lib/grub/i386-pc/aout.module
> +usr/lib/grub/i386-pc/archelp.mod
> +usr/lib/grub/i386-pc/archelp.module
> usr/lib/grub/i386-pc/at_keyboard.mod
> usr/lib/grub/i386-pc/at_keyboard.module
> usr/lib/grub/i386-pc/ata.mod
> @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image
> usr/lib/grub/i386-pc/boot.img
> usr/lib/grub/i386-pc/boot.mod
> usr/lib/grub/i386-pc/boot.module
> +usr/lib/grub/i386-pc/boot_hybrid.image
> +usr/lib/grub/i386-pc/boot_hybrid.img
> usr/lib/grub/i386-pc/bsd.mod
> usr/lib/grub/i386-pc/bsd.module
> +usr/lib/grub/i386-pc/bswap_test.mod
> +usr/lib/grub/i386-pc/bswap_test.module
> usr/lib/grub/i386-pc/btrfs.mod
> usr/lib/grub/i386-pc/btrfs.module
> usr/lib/grub/i386-pc/bufio.mod
> usr/lib/grub/i386-pc/bufio.module
> usr/lib/grub/i386-pc/cat.mod
> usr/lib/grub/i386-pc/cat.module
> +usr/lib/grub/i386-pc/cbfs.mod
> +usr/lib/grub/i386-pc/cbfs.module
> +usr/lib/grub/i386-pc/cbls.mod
> +usr/lib/grub/i386-pc/cbls.module
> +usr/lib/grub/i386-pc/cbmemc.mod
> +usr/lib/grub/i386-pc/cbmemc.module
> +usr/lib/grub/i386-pc/cbtable.mod
> +usr/lib/grub/i386-pc/cbtable.module
> +usr/lib/grub/i386-pc/cbtime.mod
> +usr/lib/grub/i386-pc/cbtime.module
> usr/lib/grub/i386-pc/cdboot.image
> usr/lib/grub/i386-pc/cdboot.img
> usr/lib/grub/i386-pc/chain.mod
> usr/lib/grub/i386-pc/chain.module
> +usr/lib/grub/i386-pc/cmdline_cat_test.mod
> +usr/lib/grub/i386-pc/cmdline_cat_test.module
> +usr/lib/grub/i386-pc/cmosdump.mod
> +usr/lib/grub/i386-pc/cmosdump.module
> usr/lib/grub/i386-pc/cmostest.mod
> usr/lib/grub/i386-pc/cmostest.module
> usr/lib/grub/i386-pc/cmp.mod
> usr/lib/grub/i386-pc/cmp.module
> +usr/lib/grub/i386-pc/cmp_test.mod
> +usr/lib/grub/i386-pc/cmp_test.module
> usr/lib/grub/i386-pc/command.lst
> usr/lib/grub/i386-pc/config.h
> usr/lib/grub/i386-pc/configfile.mod
> @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod
> usr/lib/grub/i386-pc/cryptodisk.module
> usr/lib/grub/i386-pc/cs5536.mod
> usr/lib/grub/i386-pc/cs5536.module
> +usr/lib/grub/i386-pc/ctz_test.mod
> +usr/lib/grub/i386-pc/ctz_test.module
> usr/lib/grub/i386-pc/date.mod
> usr/lib/grub/i386-pc/date.module
> usr/lib/grub/i386-pc/datehook.mod
> usr/lib/grub/i386-pc/datehook.module
> usr/lib/grub/i386-pc/datetime.mod
> usr/lib/grub/i386-pc/datetime.module
> +usr/lib/grub/i386-pc/disk.mod
> +usr/lib/grub/i386-pc/disk.module
> usr/lib/grub/i386-pc/diskboot.image
> usr/lib/grub/i386-pc/diskboot.img
> usr/lib/grub/i386-pc/diskfilter.mod
> usr/lib/grub/i386-pc/diskfilter.module
> +usr/lib/grub/i386-pc/div.mod
> +usr/lib/grub/i386-pc/div.module
> +usr/lib/grub/i386-pc/div_test.mod
> +usr/lib/grub/i386-pc/div_test.module
> usr/lib/grub/i386-pc/dm_nv.mod
> usr/lib/grub/i386-pc/dm_nv.module
> usr/lib/grub/i386-pc/drivemap.mod
> @@ -115,12 +150,12 @@ usr/lib/grub/i386-pc/echo.mod
> usr/lib/grub/i386-pc/echo.module
> usr/lib/grub/i386-pc/efiemu.mod
> usr/lib/grub/i386-pc/efiemu.module
> -usr/lib/grub/i386-pc/efiemu32.o
> -usr/lib/grub/i386-pc/efiemu64.o
> usr/lib/grub/i386-pc/ehci.mod
> usr/lib/grub/i386-pc/ehci.module
> usr/lib/grub/i386-pc/elf.mod
> usr/lib/grub/i386-pc/elf.module
> +usr/lib/grub/i386-pc/eval.mod
> +usr/lib/grub/i386-pc/eval.module
> usr/lib/grub/i386-pc/exfat.mod
> usr/lib/grub/i386-pc/exfat.module
> usr/lib/grub/i386-pc/exfctest.mod
> @@ -131,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod
> usr/lib/grub/i386-pc/extcmd.module
> usr/lib/grub/i386-pc/fat.mod
> usr/lib/grub/i386-pc/fat.module
> +usr/lib/grub/i386-pc/file.mod
> +usr/lib/grub/i386-pc/file.module
> usr/lib/grub/i386-pc/font.mod
> usr/lib/grub/i386-pc/font.module
> usr/lib/grub/i386-pc/freedos.mod
> @@ -152,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod
> usr/lib/grub/i386-pc/gcry_crc.module
> usr/lib/grub/i386-pc/gcry_des.mod
> usr/lib/grub/i386-pc/gcry_des.module
> +usr/lib/grub/i386-pc/gcry_dsa.mod
> +usr/lib/grub/i386-pc/gcry_dsa.module
> +usr/lib/grub/i386-pc/gcry_idea.mod
> +usr/lib/grub/i386-pc/gcry_idea.module
> usr/lib/grub/i386-pc/gcry_md4.mod
> usr/lib/grub/i386-pc/gcry_md4.module
> usr/lib/grub/i386-pc/gcry_md5.mod
> @@ -162,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod
> usr/lib/grub/i386-pc/gcry_rijndael.module
> usr/lib/grub/i386-pc/gcry_rmd160.mod
> usr/lib/grub/i386-pc/gcry_rmd160.module
> +usr/lib/grub/i386-pc/gcry_rsa.mod
> +usr/lib/grub/i386-pc/gcry_rsa.module
> usr/lib/grub/i386-pc/gcry_seed.mod
> usr/lib/grub/i386-pc/gcry_seed.module
> usr/lib/grub/i386-pc/gcry_serpent.mod
> @@ -189,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod
> usr/lib/grub/i386-pc/gfxmenu.module
> usr/lib/grub/i386-pc/gfxterm.mod
> usr/lib/grub/i386-pc/gfxterm.module
> +usr/lib/grub/i386-pc/gfxterm_background.mod
> +usr/lib/grub/i386-pc/gfxterm_background.module
> +usr/lib/grub/i386-pc/gfxterm_menu.mod
> +usr/lib/grub/i386-pc/gfxterm_menu.module
> usr/lib/grub/i386-pc/gmodule.pl
> usr/lib/grub/i386-pc/gptsync.mod
> usr/lib/grub/i386-pc/gptsync.module
> @@ -210,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod
> usr/lib/grub/i386-pc/hfs.module
> usr/lib/grub/i386-pc/hfsplus.mod
> usr/lib/grub/i386-pc/hfsplus.module
> +usr/lib/grub/i386-pc/hfspluscomp.mod
> +usr/lib/grub/i386-pc/hfspluscomp.module
> usr/lib/grub/i386-pc/http.mod
> usr/lib/grub/i386-pc/http.module
> usr/lib/grub/i386-pc/iorw.mod
> @@ -228,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod
> usr/lib/grub/i386-pc/keystatus.module
> usr/lib/grub/i386-pc/ldm.mod
> usr/lib/grub/i386-pc/ldm.module
> +usr/lib/grub/i386-pc/legacy_password_test.mod
> +usr/lib/grub/i386-pc/legacy_password_test.module
> usr/lib/grub/i386-pc/legacycfg.mod
> usr/lib/grub/i386-pc/legacycfg.module
> usr/lib/grub/i386-pc/linux.mod
> @@ -258,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image
> usr/lib/grub/i386-pc/lzma_decompress.img
> usr/lib/grub/i386-pc/lzopio.mod
> usr/lib/grub/i386-pc/lzopio.module
> +usr/lib/grub/i386-pc/macbless.mod
> +usr/lib/grub/i386-pc/macbless.module
> +usr/lib/grub/i386-pc/macho.mod
> +usr/lib/grub/i386-pc/macho.module
> +usr/lib/grub/i386-pc/mda_text.mod
> +usr/lib/grub/i386-pc/mda_text.module
> usr/lib/grub/i386-pc/mdraid09.mod
> usr/lib/grub/i386-pc/mdraid09.module
> usr/lib/grub/i386-pc/mdraid09_be.mod
> @@ -286,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod
> usr/lib/grub/i386-pc/mmap.module
> usr/lib/grub/i386-pc/moddep.lst
> usr/lib/grub/i386-pc/modinfo.sh
> +usr/lib/grub/i386-pc/morse.mod
> +usr/lib/grub/i386-pc/morse.module
> +usr/lib/grub/i386-pc/mpi.mod
> +usr/lib/grub/i386-pc/mpi.module
> usr/lib/grub/i386-pc/msdospart.mod
> usr/lib/grub/i386-pc/msdospart.module
> +usr/lib/grub/i386-pc/mul_test.mod
> +usr/lib/grub/i386-pc/mul_test.module
> usr/lib/grub/i386-pc/multiboot.mod
> usr/lib/grub/i386-pc/multiboot.module
> usr/lib/grub/i386-pc/multiboot2.mod
> usr/lib/grub/i386-pc/multiboot2.module
> +usr/lib/grub/i386-pc/nativedisk.mod
> +usr/lib/grub/i386-pc/nativedisk.module
> usr/lib/grub/i386-pc/net.mod
> usr/lib/grub/i386-pc/net.module
> usr/lib/grub/i386-pc/newc.mod
> @@ -308,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod
> usr/lib/grub/i386-pc/ntldr.module
> usr/lib/grub/i386-pc/odc.mod
> usr/lib/grub/i386-pc/odc.module
> +usr/lib/grub/i386-pc/offsetio.mod
> +usr/lib/grub/i386-pc/offsetio.module
> usr/lib/grub/i386-pc/ohci.mod
> usr/lib/grub/i386-pc/ohci.module
> usr/lib/grub/i386-pc/part_acorn.mod
> @@ -318,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod
> usr/lib/grub/i386-pc/part_apple.module
> usr/lib/grub/i386-pc/part_bsd.mod
> usr/lib/grub/i386-pc/part_bsd.module
> +usr/lib/grub/i386-pc/part_dfly.mod
> +usr/lib/grub/i386-pc/part_dfly.module
> usr/lib/grub/i386-pc/part_dvh.mod
> usr/lib/grub/i386-pc/part_dvh.module
> usr/lib/grub/i386-pc/part_gpt.mod
> @@ -342,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod
> usr/lib/grub/i386-pc/pata.module
> usr/lib/grub/i386-pc/pbkdf2.mod
> usr/lib/grub/i386-pc/pbkdf2.module
> +usr/lib/grub/i386-pc/pbkdf2_test.mod
> +usr/lib/grub/i386-pc/pbkdf2_test.module
> usr/lib/grub/i386-pc/pci.mod
> usr/lib/grub/i386-pc/pci.module
> +usr/lib/grub/i386-pc/pcidump.mod
> +usr/lib/grub/i386-pc/pcidump.module
> usr/lib/grub/i386-pc/plan9.mod
> usr/lib/grub/i386-pc/plan9.module
> usr/lib/grub/i386-pc/play.mod
> @@ -354,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod
> usr/lib/grub/i386-pc/priority_queue.module
> usr/lib/grub/i386-pc/probe.mod
> usr/lib/grub/i386-pc/probe.module
> +usr/lib/grub/i386-pc/procfs.mod
> +usr/lib/grub/i386-pc/procfs.module
> +usr/lib/grub/i386-pc/progress.mod
> +usr/lib/grub/i386-pc/progress.module
> usr/lib/grub/i386-pc/pxe.mod
> usr/lib/grub/i386-pc/pxe.module
> usr/lib/grub/i386-pc/pxeboot.image
> @@ -364,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod
> usr/lib/grub/i386-pc/raid5rec.module
> usr/lib/grub/i386-pc/raid6rec.mod
> usr/lib/grub/i386-pc/raid6rec.module
> +usr/lib/grub/i386-pc/random.mod
> +usr/lib/grub/i386-pc/random.module
> usr/lib/grub/i386-pc/read.mod
> usr/lib/grub/i386-pc/read.module
> usr/lib/grub/i386-pc/reboot.mod
> @@ -392,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod
> usr/lib/grub/i386-pc/serial.module
> usr/lib/grub/i386-pc/setjmp.mod
> usr/lib/grub/i386-pc/setjmp.module
> +usr/lib/grub/i386-pc/setjmp_test.mod
> +usr/lib/grub/i386-pc/setjmp_test.module
> usr/lib/grub/i386-pc/setpci.mod
> usr/lib/grub/i386-pc/setpci.module
> usr/lib/grub/i386-pc/sfs.mod
> usr/lib/grub/i386-pc/sfs.module
> +usr/lib/grub/i386-pc/shift_test.mod
> +usr/lib/grub/i386-pc/shift_test.module
> +usr/lib/grub/i386-pc/signature_test.mod
> +usr/lib/grub/i386-pc/signature_test.module
> usr/lib/grub/i386-pc/sleep.mod
> usr/lib/grub/i386-pc/sleep.module
> +usr/lib/grub/i386-pc/sleep_test.mod
> +usr/lib/grub/i386-pc/sleep_test.module
> +usr/lib/grub/i386-pc/spkmodem.mod
> +usr/lib/grub/i386-pc/spkmodem.module
> usr/lib/grub/i386-pc/squash4.mod
> usr/lib/grub/i386-pc/squash4.module
> +usr/lib/grub/i386-pc/syslinuxcfg.mod
> +usr/lib/grub/i386-pc/syslinuxcfg.module
> usr/lib/grub/i386-pc/tar.mod
> usr/lib/grub/i386-pc/tar.module
> usr/lib/grub/i386-pc/terminal.lst
> @@ -413,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod
> usr/lib/grub/i386-pc/test_blockarg.module
> usr/lib/grub/i386-pc/testload.mod
> usr/lib/grub/i386-pc/testload.module
> +usr/lib/grub/i386-pc/testspeed.mod
> +usr/lib/grub/i386-pc/testspeed.module
> usr/lib/grub/i386-pc/tftp.mod
> usr/lib/grub/i386-pc/tftp.module
> usr/lib/grub/i386-pc/tga.mod
> usr/lib/grub/i386-pc/tga.module
> usr/lib/grub/i386-pc/time.mod
> usr/lib/grub/i386-pc/time.module
> +usr/lib/grub/i386-pc/tr.mod
> +usr/lib/grub/i386-pc/tr.module
> usr/lib/grub/i386-pc/trig.mod
> usr/lib/grub/i386-pc/trig.module
> usr/lib/grub/i386-pc/true.mod
> usr/lib/grub/i386-pc/true.module
> +usr/lib/grub/i386-pc/truecrypt.mod
> +usr/lib/grub/i386-pc/truecrypt.module
> usr/lib/grub/i386-pc/udf.mod
> usr/lib/grub/i386-pc/udf.module
> usr/lib/grub/i386-pc/ufs1.mod
> usr/lib/grub/i386-pc/ufs1.module
> +usr/lib/grub/i386-pc/ufs1_be.mod
> +usr/lib/grub/i386-pc/ufs1_be.module
> usr/lib/grub/i386-pc/ufs2.mod
> usr/lib/grub/i386-pc/ufs2.module
> usr/lib/grub/i386-pc/uhci.mod
> @@ -443,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod
> usr/lib/grub/i386-pc/usbserial_ftdi.module
> usr/lib/grub/i386-pc/usbserial_pl2303.mod
> usr/lib/grub/i386-pc/usbserial_pl2303.module
> +usr/lib/grub/i386-pc/usbserial_usbdebug.mod
> +usr/lib/grub/i386-pc/usbserial_usbdebug.module
> usr/lib/grub/i386-pc/usbtest.mod
> usr/lib/grub/i386-pc/usbtest.module
> usr/lib/grub/i386-pc/vbe.mod
> usr/lib/grub/i386-pc/vbe.module
> +usr/lib/grub/i386-pc/verify.mod
> +usr/lib/grub/i386-pc/verify.module
> usr/lib/grub/i386-pc/vga.mod
> usr/lib/grub/i386-pc/vga.module
> usr/lib/grub/i386-pc/vga_text.mod
> @@ -458,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod
> usr/lib/grub/i386-pc/video_bochs.module
> usr/lib/grub/i386-pc/video_cirrus.mod
> usr/lib/grub/i386-pc/video_cirrus.module
> +usr/lib/grub/i386-pc/video_colors.mod
> +usr/lib/grub/i386-pc/video_colors.module
> usr/lib/grub/i386-pc/video_fb.mod
> usr/lib/grub/i386-pc/video_fb.module
> usr/lib/grub/i386-pc/videoinfo.mod
> usr/lib/grub/i386-pc/videoinfo.module
> usr/lib/grub/i386-pc/videotest.mod
> usr/lib/grub/i386-pc/videotest.module
> +usr/lib/grub/i386-pc/videotest_checksum.mod
> +usr/lib/grub/i386-pc/videotest_checksum.module
> usr/lib/grub/i386-pc/xfs.mod
> usr/lib/grub/i386-pc/xfs.module
> usr/lib/grub/i386-pc/xnu.mod
> usr/lib/grub/i386-pc/xnu.module
> usr/lib/grub/i386-pc/xnu_uuid.mod
> usr/lib/grub/i386-pc/xnu_uuid.module
> +usr/lib/grub/i386-pc/xnu_uuid_test.mod
> +usr/lib/grub/i386-pc/xnu_uuid_test.module
> usr/lib/grub/i386-pc/xzio.mod
> usr/lib/grub/i386-pc/xzio.module
> usr/lib/grub/i386-pc/zfs.mod
> @@ -480,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod
> usr/lib/grub/i386-pc/zfsinfo.module
> usr/sbin/grub-bios-setup
> usr/sbin/grub-install
> +usr/sbin/grub-macbless
> usr/sbin/grub-mkconfig
> -usr/sbin/grub-mknetdir
> usr/sbin/grub-ofpathname
> usr/sbin/grub-probe
> usr/sbin/grub-reboot
> @@ -520,19 +629,27 @@ usr/share/grub/grub-mkconfig_lib
> #usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo
> #usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo
> #usr/share/locale/eo/LC_MESSAGES/grub.mo
> +#usr/share/locale/es/LC_MESSAGES/grub.mo
> #usr/share/locale/fi/LC_MESSAGES/grub.mo
> #usr/share/locale/fr/LC_MESSAGES/grub.mo
> +#usr/share/locale/gl/LC_MESSAGES/grub.mo
> #usr/share/locale/hu/LC_MESSAGES/grub.mo
> #usr/share/locale/id/LC_MESSAGES/grub.mo
> #usr/share/locale/it/LC_MESSAGES/grub.mo
> #usr/share/locale/ja/LC_MESSAGES/grub.mo
> +#usr/share/locale/lt/LC_MESSAGES/grub.mo
> +#usr/share/locale/nb/LC_MESSAGES/grub.mo
> #usr/share/locale/nl/LC_MESSAGES/grub.mo
> #usr/share/locale/pa
> #usr/share/locale/pa/LC_MESSAGES
> #usr/share/locale/pa/LC_MESSAGES/grub.mo
> #usr/share/locale/pl/LC_MESSAGES/grub.mo
> +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo
> #usr/share/locale/ru/LC_MESSAGES/grub.mo
> +#usr/share/locale/sl/LC_MESSAGES/grub.mo
> +#usr/share/locale/sr/LC_MESSAGES/grub.mo
> #usr/share/locale/sv/LC_MESSAGES/grub.mo
> +#usr/share/locale/tr/LC_MESSAGES/grub.mo
> #usr/share/locale/uk/LC_MESSAGES/grub.mo
> #usr/share/locale/vi/LC_MESSAGES/grub.mo
> #usr/share/locale/zh_CN/LC_MESSAGES/grub.mo
> diff --git a/lfs/flash-images b/lfs/flash-images
> index d10fc9b..c95dbd9 100644
> --- a/lfs/flash-images
> +++ b/lfs/flash-images
> @@ -193,7 +193,7 @@ endif
> -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s
> UUID $(PART_ROOT))/g"
>
> # Install GRUB
> - grub-install --force --recheck --no-floppy \
> + grub-install --force --recheck --no-floppy --directory
> /usr/lib/grub/i386-pc \
> --root-directory=$(MNThdd) $(DEVICE)
> endif
>
> diff --git a/lfs/grub b/lfs/grub
> index ba74408..e4359b7 100644
> --- a/lfs/grub
> +++ b/lfs/grub
> @@ -1,7 +1,7 @@
> #############################################################################
> ##
> #
> #
> # IPFire.org - A linux based
> firewall #
> -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org>
> #
> +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org>
> #
> #
> #
> # This program is free software: you can redistribute it and/or
> modify #
> # it under the terms of the GNU General Public License as published
> by #
> @@ -24,7 +24,7 @@
>
> include Config
>
> -VER = 2.00
> +VER = 2.02~beta3
>
> THISAPP = grub-$(VER)
> DL_FILE = $(THISAPP).tar.xz
> @@ -41,13 +41,13 @@ CXXFLAGS =
> #############################################################################
> ##
>
> objects = $(DL_FILE) \
> - unifont-7.0.03.pcf.gz
> + unifont-9.0.02.pcf.gz
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> -unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
> +unifont-9.0.02.pcf.gz = $(DL_FROM)/unifont-9.0.02.pcf.gz
>
> -$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91
> -unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
> +$(DL_FILE)_MD5 = ab399fc6f74a97d66ff77f04b743149c
> +unifont-9.0.02.pcf.gz_MD5 = 8819d828361a6b70dcac793c1ec235bb
>
> install : $(TARGET)
>
> @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> @$(PREBUILD)
> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-
> 2.00_disable_vga_fallback.patch
> cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/0001-Fix-CVE-
> 2015-8370-Grub2-user-pass-vulnerability.patch
> cd $(DIR_APP) && \
> ./configure \
> @@ -85,6 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> --sysconfdir=/etc \
> --with-platform=pc \
> --with-grubdir=grub \
> + --disable-efiemu \
> + --disable-grub-emu-usb \
> --program-transform-name=s,grub,grub, \
> --disable-grub-mount \
> --disable-werror
> @@ -100,15 +101,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
>
> # Disable hardening.
> - paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
> - paxctl -mpexs /usr/bin/grub-script-check
> + paxctl -mpesc /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
>
> # We don't need to install unifont just to generate a grub2
> compatible
> # font archive for the graphical boot menu. The following command
> only
> # converts Latin-1, Latin Extended A+B, Arrows, Box and Block
> characters.
> /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
> --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
> - $(DIR_DL)/unifont-7.0.03.pcf.gz
> + $(DIR_DL)/unifont-9.0.02.pcf.gz
>
> @rm -rf $(DIR_APP)
> @$(POSTBUILD)
> diff --git a/src/patches/grub-2.00_disable_vga_fallback.patch
> b/src/patches/grub-2.00_disable_vga_fallback.patch
> deleted file mode 100644
> index 0d1dec9..0000000
> --- a/src/patches/grub-2.00_disable_vga_fallback.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -We have to remove the vga fallback because this not work on bay-trail and
> other
> -new intel onboard graphics.
> -
> -diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c grub-2.00/grub-
> core/video/i386/pc/vga.c
> ---- grub-2.00.org/grub-core/video/i386/pc/vga.c 2012-06-06
> 23:21:02.000000000 +0200
> -+++ grub-2.00/grub-core/video/i386/pc/vga.c 2014-09-05
> 21:41:04.790870375 +0200
> -@@ -122,7 +122,7 @@
> - {
> - grub_err_t err;
> -
> -- if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
> -+// if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
> - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
> -
> - framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-26 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-03 7:15 [PATCH] grub: update 2.02~beta3 v2 Marcel Lorenz
2016-09-26 19:13 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox