From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Lorenz To: development@lists.ipfire.org Subject: Re: [PATCH v2] grub: update to 2.02 Date: Wed, 14 Jun 2017 15:02:43 +0200 Message-ID: In-Reply-To: <1497288351.21214.27.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9011277959516757539==" List-Id: --===============9011277959516757539== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, i test all my builds only in a vm (vmware). Have no problems without the=20 patch. I can make an new patch with "grub-2.00_disable_vga_fallback.patch" if=20 you want or additional test on real hardware are needed. I don't have hardware=20 for testing, all my IPFires run in a VM ;-) ps. on my older QNAP with integrated Intel graphic (Atom D525) are all=20 ok... Best, MArcel Am 2017-06-12 19:25, schrieb Michael Tremer: > Hello, >=20 > did you test GRUB on the hardware that needed the VGA fallback patch? >=20 > -Michael >=20 > On Sat, 2017-06-10 at 21:42 +0200, Marcel Lorenz wrote: >> Signed-off-by: Marcel Lorenz >> --- >> =C2=A0config/rootfiles/common/i586/grub=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| = 127=20 >> +++++++++++++++++++- >> =C2=A0config/rootfiles/common/x86_64/grub=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 129 >> ++++++++++++++++++++- >> =C2=A0lfs/grub=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A020 ++-- >> =C2=A0...E-2015-8370-Grub2-user-pass-vulnerability.patch |=C2=A0=C2=A045 -= ------ >> =C2=A0src/patches/grub-2.00_disable_vga_fallback.patch=C2=A0=C2=A0=C2=A0|= =C2=A0=C2=A015 --- >> =C2=A0src/patches/grub2-remove-gets.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A02= 1 ---- >> =C2=A06 files changed, 258 insertions(+), 99 deletions(-) >> =C2=A0delete mode 100644=20 >> src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass- >> vulnerability.patch >> =C2=A0delete mode 100644 src/patches/grub-2.00_disable_vga_fallback.patch >> =C2=A0delete mode 100644 src/patches/grub2-remove-gets.patch >>=20 >> diff --git a/config/rootfiles/common/i586/grub >> b/config/rootfiles/common/i586/grub >> index 9d71942..5299f73 100644 >> --- a/config/rootfiles/common/i586/grub >> +++ b/config/rootfiles/common/i586/grub >> @@ -15,19 +15,24 @@ etc/grub.d/41_custom >> =C2=A0etc/grub.d/README >> =C2=A0etc/grub2.cfg >> =C2=A0usr/bin/grub-editenv >> +usr/bin/grub-file >> =C2=A0usr/bin/grub-fstest >> +usr/bin/grub-glue-efi >> =C2=A0usr/bin/grub-kbdcomp >> =C2=A0usr/bin/grub-menulst2cfg >> =C2=A0usr/bin/grub-mkfont >> =C2=A0usr/bin/grub-mkimage >> =C2=A0usr/bin/grub-mklayout >> +usr/bin/grub-mknetdir >> =C2=A0usr/bin/grub-mkpasswd-pbkdf2 >> =C2=A0usr/bin/grub-mkrelpath >> =C2=A0usr/bin/grub-mkrescue >> =C2=A0usr/bin/grub-mkstandalone >> +usr/bin/grub-render-label >> =C2=A0usr/bin/grub-script-check >> -usr/lib/grub >> -usr/lib/grub/i386-pc >> +usr/bin/grub-syslinux2cfg >> +#usr/lib/grub >> +#usr/lib/grub/i386-pc >> =C2=A0usr/lib/grub/i386-pc/acpi.mod >> =C2=A0usr/lib/grub/i386-pc/acpi.module >> =C2=A0usr/lib/grub/i386-pc/adler32.mod >> @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod >> =C2=A0usr/lib/grub/i386-pc/all_video.module >> =C2=A0usr/lib/grub/i386-pc/aout.mod >> =C2=A0usr/lib/grub/i386-pc/aout.module >> +usr/lib/grub/i386-pc/archelp.mod >> +usr/lib/grub/i386-pc/archelp.module >> =C2=A0usr/lib/grub/i386-pc/at_keyboard.mod >> =C2=A0usr/lib/grub/i386-pc/at_keyboard.module >> =C2=A0usr/lib/grub/i386-pc/ata.mod >> @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image >> =C2=A0usr/lib/grub/i386-pc/boot.img >> =C2=A0usr/lib/grub/i386-pc/boot.mod >> =C2=A0usr/lib/grub/i386-pc/boot.module >> +usr/lib/grub/i386-pc/boot_hybrid.image >> +usr/lib/grub/i386-pc/boot_hybrid.img >> =C2=A0usr/lib/grub/i386-pc/bsd.mod >> =C2=A0usr/lib/grub/i386-pc/bsd.module >> +usr/lib/grub/i386-pc/bswap_test.mod >> +usr/lib/grub/i386-pc/bswap_test.module >> =C2=A0usr/lib/grub/i386-pc/btrfs.mod >> =C2=A0usr/lib/grub/i386-pc/btrfs.module >> =C2=A0usr/lib/grub/i386-pc/bufio.mod >> =C2=A0usr/lib/grub/i386-pc/bufio.module >> =C2=A0usr/lib/grub/i386-pc/cat.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/cdboot.image >> =C2=A0usr/lib/grub/i386-pc/cdboot.img >> =C2=A0usr/lib/grub/i386-pc/chain.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/cmostest.mod >> =C2=A0usr/lib/grub/i386-pc/cmostest.module >> =C2=A0usr/lib/grub/i386-pc/cmp.mod >> =C2=A0usr/lib/grub/i386-pc/cmp.module >> +usr/lib/grub/i386-pc/cmp_test.mod >> +usr/lib/grub/i386-pc/cmp_test.module >> =C2=A0usr/lib/grub/i386-pc/command.lst >> =C2=A0usr/lib/grub/i386-pc/config.h >> =C2=A0usr/lib/grub/i386-pc/configfile.mod >> @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod >> =C2=A0usr/lib/grub/i386-pc/cryptodisk.module >> =C2=A0usr/lib/grub/i386-pc/cs5536.mod >> =C2=A0usr/lib/grub/i386-pc/cs5536.module >> +usr/lib/grub/i386-pc/ctz_test.mod >> +usr/lib/grub/i386-pc/ctz_test.module >> =C2=A0usr/lib/grub/i386-pc/date.mod >> =C2=A0usr/lib/grub/i386-pc/date.module >> =C2=A0usr/lib/grub/i386-pc/datehook.mod >> =C2=A0usr/lib/grub/i386-pc/datehook.module >> =C2=A0usr/lib/grub/i386-pc/datetime.mod >> =C2=A0usr/lib/grub/i386-pc/datetime.module >> +usr/lib/grub/i386-pc/disk.mod >> +usr/lib/grub/i386-pc/disk.module >> =C2=A0usr/lib/grub/i386-pc/diskboot.image >> =C2=A0usr/lib/grub/i386-pc/diskboot.img >> =C2=A0usr/lib/grub/i386-pc/diskfilter.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/dm_nv.mod >> =C2=A0usr/lib/grub/i386-pc/dm_nv.module >> =C2=A0usr/lib/grub/i386-pc/drivemap.mod >> @@ -119,6 +154,8 @@ usr/lib/grub/i386-pc/ehci.mod >> =C2=A0usr/lib/grub/i386-pc/ehci.module >> =C2=A0usr/lib/grub/i386-pc/elf.mod >> =C2=A0usr/lib/grub/i386-pc/elf.module >> +usr/lib/grub/i386-pc/eval.mod >> +usr/lib/grub/i386-pc/eval.module >> =C2=A0usr/lib/grub/i386-pc/exfat.mod >> =C2=A0usr/lib/grub/i386-pc/exfat.module >> =C2=A0usr/lib/grub/i386-pc/exfctest.mod >> @@ -129,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod >> =C2=A0usr/lib/grub/i386-pc/extcmd.module >> =C2=A0usr/lib/grub/i386-pc/fat.mod >> =C2=A0usr/lib/grub/i386-pc/fat.module >> +usr/lib/grub/i386-pc/file.mod >> +usr/lib/grub/i386-pc/file.module >> =C2=A0usr/lib/grub/i386-pc/font.mod >> =C2=A0usr/lib/grub/i386-pc/font.module >> =C2=A0usr/lib/grub/i386-pc/freedos.mod >> @@ -150,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_crc.module >> =C2=A0usr/lib/grub/i386-pc/gcry_des.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/gcry_md4.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_md4.module >> =C2=A0usr/lib/grub/i386-pc/gcry_md5.mod >> @@ -160,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_rijndael.module >> =C2=A0usr/lib/grub/i386-pc/gcry_rmd160.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_rmd160.module >> +usr/lib/grub/i386-pc/gcry_rsa.mod >> +usr/lib/grub/i386-pc/gcry_rsa.module >> =C2=A0usr/lib/grub/i386-pc/gcry_seed.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_seed.module >> =C2=A0usr/lib/grub/i386-pc/gcry_serpent.mod >> @@ -187,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod >> =C2=A0usr/lib/grub/i386-pc/gfxmenu.module >> =C2=A0usr/lib/grub/i386-pc/gfxterm.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/gmodule.pl >> =C2=A0usr/lib/grub/i386-pc/gptsync.mod >> =C2=A0usr/lib/grub/i386-pc/gptsync.module >> @@ -208,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod >> =C2=A0usr/lib/grub/i386-pc/hfs.module >> =C2=A0usr/lib/grub/i386-pc/hfsplus.mod >> =C2=A0usr/lib/grub/i386-pc/hfsplus.module >> +usr/lib/grub/i386-pc/hfspluscomp.mod >> +usr/lib/grub/i386-pc/hfspluscomp.module >> =C2=A0usr/lib/grub/i386-pc/http.mod >> =C2=A0usr/lib/grub/i386-pc/http.module >> =C2=A0usr/lib/grub/i386-pc/iorw.mod >> @@ -226,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod >> =C2=A0usr/lib/grub/i386-pc/keystatus.module >> =C2=A0usr/lib/grub/i386-pc/ldm.mod >> =C2=A0usr/lib/grub/i386-pc/ldm.module >> +usr/lib/grub/i386-pc/legacy_password_test.mod >> +usr/lib/grub/i386-pc/legacy_password_test.module >> =C2=A0usr/lib/grub/i386-pc/legacycfg.mod >> =C2=A0usr/lib/grub/i386-pc/legacycfg.module >> =C2=A0usr/lib/grub/i386-pc/linux.mod >> @@ -256,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image >> =C2=A0usr/lib/grub/i386-pc/lzma_decompress.img >> =C2=A0usr/lib/grub/i386-pc/lzopio.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/mdraid09.mod >> =C2=A0usr/lib/grub/i386-pc/mdraid09.module >> =C2=A0usr/lib/grub/i386-pc/mdraid09_be.mod >> @@ -284,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod >> =C2=A0usr/lib/grub/i386-pc/mmap.module >> =C2=A0usr/lib/grub/i386-pc/moddep.lst >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/msdospart.mod >> =C2=A0usr/lib/grub/i386-pc/msdospart.module >> +usr/lib/grub/i386-pc/mul_test.mod >> +usr/lib/grub/i386-pc/mul_test.module >> =C2=A0usr/lib/grub/i386-pc/multiboot.mod >> =C2=A0usr/lib/grub/i386-pc/multiboot.module >> =C2=A0usr/lib/grub/i386-pc/multiboot2.mod >> =C2=A0usr/lib/grub/i386-pc/multiboot2.module >> +usr/lib/grub/i386-pc/nativedisk.mod >> +usr/lib/grub/i386-pc/nativedisk.module >> =C2=A0usr/lib/grub/i386-pc/net.mod >> =C2=A0usr/lib/grub/i386-pc/net.module >> =C2=A0usr/lib/grub/i386-pc/newc.mod >> @@ -306,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod >> =C2=A0usr/lib/grub/i386-pc/ntldr.module >> =C2=A0usr/lib/grub/i386-pc/odc.mod >> =C2=A0usr/lib/grub/i386-pc/odc.module >> +usr/lib/grub/i386-pc/offsetio.mod >> +usr/lib/grub/i386-pc/offsetio.module >> =C2=A0usr/lib/grub/i386-pc/ohci.mod >> =C2=A0usr/lib/grub/i386-pc/ohci.module >> =C2=A0usr/lib/grub/i386-pc/part_acorn.mod >> @@ -316,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod >> =C2=A0usr/lib/grub/i386-pc/part_apple.module >> =C2=A0usr/lib/grub/i386-pc/part_bsd.mod >> =C2=A0usr/lib/grub/i386-pc/part_bsd.module >> +usr/lib/grub/i386-pc/part_dfly.mod >> +usr/lib/grub/i386-pc/part_dfly.module >> =C2=A0usr/lib/grub/i386-pc/part_dvh.mod >> =C2=A0usr/lib/grub/i386-pc/part_dvh.module >> =C2=A0usr/lib/grub/i386-pc/part_gpt.mod >> @@ -340,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod >> =C2=A0usr/lib/grub/i386-pc/pata.module >> =C2=A0usr/lib/grub/i386-pc/pbkdf2.mod >> =C2=A0usr/lib/grub/i386-pc/pbkdf2.module >> +usr/lib/grub/i386-pc/pbkdf2_test.mod >> +usr/lib/grub/i386-pc/pbkdf2_test.module >> =C2=A0usr/lib/grub/i386-pc/pci.mod >> =C2=A0usr/lib/grub/i386-pc/pci.module >> +usr/lib/grub/i386-pc/pcidump.mod >> +usr/lib/grub/i386-pc/pcidump.module >> =C2=A0usr/lib/grub/i386-pc/plan9.mod >> =C2=A0usr/lib/grub/i386-pc/plan9.module >> =C2=A0usr/lib/grub/i386-pc/play.mod >> @@ -352,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod >> =C2=A0usr/lib/grub/i386-pc/priority_queue.module >> =C2=A0usr/lib/grub/i386-pc/probe.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/pxe.mod >> =C2=A0usr/lib/grub/i386-pc/pxe.module >> =C2=A0usr/lib/grub/i386-pc/pxeboot.image >> @@ -362,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod >> =C2=A0usr/lib/grub/i386-pc/raid5rec.module >> =C2=A0usr/lib/grub/i386-pc/raid6rec.mod >> =C2=A0usr/lib/grub/i386-pc/raid6rec.module >> +usr/lib/grub/i386-pc/random.mod >> +usr/lib/grub/i386-pc/random.module >> =C2=A0usr/lib/grub/i386-pc/read.mod >> =C2=A0usr/lib/grub/i386-pc/read.module >> =C2=A0usr/lib/grub/i386-pc/reboot.mod >> @@ -390,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod >> =C2=A0usr/lib/grub/i386-pc/serial.module >> =C2=A0usr/lib/grub/i386-pc/setjmp.mod >> =C2=A0usr/lib/grub/i386-pc/setjmp.module >> +usr/lib/grub/i386-pc/setjmp_test.mod >> +usr/lib/grub/i386-pc/setjmp_test.module >> =C2=A0usr/lib/grub/i386-pc/setpci.mod >> =C2=A0usr/lib/grub/i386-pc/setpci.module >> =C2=A0usr/lib/grub/i386-pc/sfs.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/sleep.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/squash4.mod >> =C2=A0usr/lib/grub/i386-pc/squash4.module >> +usr/lib/grub/i386-pc/syslinuxcfg.mod >> +usr/lib/grub/i386-pc/syslinuxcfg.module >> =C2=A0usr/lib/grub/i386-pc/tar.mod >> =C2=A0usr/lib/grub/i386-pc/tar.module >> =C2=A0usr/lib/grub/i386-pc/terminal.lst >> @@ -411,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod >> =C2=A0usr/lib/grub/i386-pc/test_blockarg.module >> =C2=A0usr/lib/grub/i386-pc/testload.mod >> =C2=A0usr/lib/grub/i386-pc/testload.module >> +usr/lib/grub/i386-pc/testspeed.mod >> +usr/lib/grub/i386-pc/testspeed.module >> =C2=A0usr/lib/grub/i386-pc/tftp.mod >> =C2=A0usr/lib/grub/i386-pc/tftp.module >> =C2=A0usr/lib/grub/i386-pc/tga.mod >> =C2=A0usr/lib/grub/i386-pc/tga.module >> =C2=A0usr/lib/grub/i386-pc/time.mod >> =C2=A0usr/lib/grub/i386-pc/time.module >> +usr/lib/grub/i386-pc/tr.mod >> +usr/lib/grub/i386-pc/tr.module >> =C2=A0usr/lib/grub/i386-pc/trig.mod >> =C2=A0usr/lib/grub/i386-pc/trig.module >> =C2=A0usr/lib/grub/i386-pc/true.mod >> =C2=A0usr/lib/grub/i386-pc/true.module >> +usr/lib/grub/i386-pc/truecrypt.mod >> +usr/lib/grub/i386-pc/truecrypt.module >> =C2=A0usr/lib/grub/i386-pc/udf.mod >> =C2=A0usr/lib/grub/i386-pc/udf.module >> =C2=A0usr/lib/grub/i386-pc/ufs1.mod >> =C2=A0usr/lib/grub/i386-pc/ufs1.module >> +usr/lib/grub/i386-pc/ufs1_be.mod >> +usr/lib/grub/i386-pc/ufs1_be.module >> =C2=A0usr/lib/grub/i386-pc/ufs2.mod >> =C2=A0usr/lib/grub/i386-pc/ufs2.module >> =C2=A0usr/lib/grub/i386-pc/uhci.mod >> @@ -441,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod >> =C2=A0usr/lib/grub/i386-pc/usbserial_ftdi.module >> =C2=A0usr/lib/grub/i386-pc/usbserial_pl2303.mod >> =C2=A0usr/lib/grub/i386-pc/usbserial_pl2303.module >> +usr/lib/grub/i386-pc/usbserial_usbdebug.mod >> +usr/lib/grub/i386-pc/usbserial_usbdebug.module >> =C2=A0usr/lib/grub/i386-pc/usbtest.mod >> =C2=A0usr/lib/grub/i386-pc/usbtest.module >> =C2=A0usr/lib/grub/i386-pc/vbe.mod >> =C2=A0usr/lib/grub/i386-pc/vbe.module >> +usr/lib/grub/i386-pc/verify.mod >> +usr/lib/grub/i386-pc/verify.module >> =C2=A0usr/lib/grub/i386-pc/vga.mod >> =C2=A0usr/lib/grub/i386-pc/vga.module >> =C2=A0usr/lib/grub/i386-pc/vga_text.mod >> @@ -456,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod >> =C2=A0usr/lib/grub/i386-pc/video_bochs.module >> =C2=A0usr/lib/grub/i386-pc/video_cirrus.mod >> =C2=A0usr/lib/grub/i386-pc/video_cirrus.module >> +usr/lib/grub/i386-pc/video_colors.mod >> +usr/lib/grub/i386-pc/video_colors.module >> =C2=A0usr/lib/grub/i386-pc/video_fb.mod >> =C2=A0usr/lib/grub/i386-pc/video_fb.module >> =C2=A0usr/lib/grub/i386-pc/videoinfo.mod >> =C2=A0usr/lib/grub/i386-pc/videoinfo.module >> =C2=A0usr/lib/grub/i386-pc/videotest.mod >> =C2=A0usr/lib/grub/i386-pc/videotest.module >> +usr/lib/grub/i386-pc/videotest_checksum.mod >> +usr/lib/grub/i386-pc/videotest_checksum.module >> =C2=A0usr/lib/grub/i386-pc/xfs.mod >> =C2=A0usr/lib/grub/i386-pc/xfs.module >> =C2=A0usr/lib/grub/i386-pc/xnu.mod >> =C2=A0usr/lib/grub/i386-pc/xnu.module >> =C2=A0usr/lib/grub/i386-pc/xnu_uuid.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/xzio.mod >> =C2=A0usr/lib/grub/i386-pc/xzio.module >> =C2=A0usr/lib/grub/i386-pc/zfs.mod >> @@ -478,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod >> =C2=A0usr/lib/grub/i386-pc/zfsinfo.module >> =C2=A0usr/sbin/grub-bios-setup >> =C2=A0usr/sbin/grub-install >> +usr/sbin/grub-macbless >> =C2=A0usr/sbin/grub-mkconfig >> -usr/sbin/grub-mknetdir >> =C2=A0usr/sbin/grub-ofpathname >> =C2=A0usr/sbin/grub-probe >> =C2=A0usr/sbin/grub-reboot >> @@ -518,19 +629,29 @@ usr/share/grub/grub-mkconfig_lib >> =C2=A0#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/eo/LC_MESSAGES/grub.mo >> +#usr/share/locale/es/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/fi/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/fr/LC_MESSAGES/grub.mo >> +#usr/share/locale/gl/LC_MESSAGES/grub.mo >> +#usr/share/locale/hr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/hu/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/id/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/it/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/ja/LC_MESSAGES/grub.mo >> +#usr/share/locale/ko/LC_MESSAGES/grub.mo >> +#usr/share/locale/lt/LC_MESSAGES/grub.mo >> +#usr/share/locale/nb/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/nl/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/pa >> =C2=A0#usr/share/locale/pa/LC_MESSAGES >> =C2=A0#usr/share/locale/pa/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/pl/LC_MESSAGES/grub.mo >> +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/ru/LC_MESSAGES/grub.mo >> +#usr/share/locale/sl/LC_MESSAGES/grub.mo >> +#usr/share/locale/sr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/sv/LC_MESSAGES/grub.mo >> +#usr/share/locale/tr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/uk/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/vi/LC_MESSAGES/grub.mo >> =C2=A0#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..5299f73 100644 >> --- a/config/rootfiles/common/x86_64/grub >> +++ b/config/rootfiles/common/x86_64/grub >> @@ -15,19 +15,24 @@ etc/grub.d/41_custom >> =C2=A0etc/grub.d/README >> =C2=A0etc/grub2.cfg >> =C2=A0usr/bin/grub-editenv >> +usr/bin/grub-file >> =C2=A0usr/bin/grub-fstest >> +usr/bin/grub-glue-efi >> =C2=A0usr/bin/grub-kbdcomp >> =C2=A0usr/bin/grub-menulst2cfg >> =C2=A0usr/bin/grub-mkfont >> =C2=A0usr/bin/grub-mkimage >> =C2=A0usr/bin/grub-mklayout >> +usr/bin/grub-mknetdir >> =C2=A0usr/bin/grub-mkpasswd-pbkdf2 >> =C2=A0usr/bin/grub-mkrelpath >> =C2=A0usr/bin/grub-mkrescue >> =C2=A0usr/bin/grub-mkstandalone >> +usr/bin/grub-render-label >> =C2=A0usr/bin/grub-script-check >> -usr/lib/grub >> -usr/lib/grub/i386-pc >> +usr/bin/grub-syslinux2cfg >> +#usr/lib/grub >> +#usr/lib/grub/i386-pc >> =C2=A0usr/lib/grub/i386-pc/acpi.mod >> =C2=A0usr/lib/grub/i386-pc/acpi.module >> =C2=A0usr/lib/grub/i386-pc/adler32.mod >> @@ -42,6 +47,8 @@ usr/lib/grub/i386-pc/all_video.mod >> =C2=A0usr/lib/grub/i386-pc/all_video.module >> =C2=A0usr/lib/grub/i386-pc/aout.mod >> =C2=A0usr/lib/grub/i386-pc/aout.module >> +usr/lib/grub/i386-pc/archelp.mod >> +usr/lib/grub/i386-pc/archelp.module >> =C2=A0usr/lib/grub/i386-pc/at_keyboard.mod >> =C2=A0usr/lib/grub/i386-pc/at_keyboard.module >> =C2=A0usr/lib/grub/i386-pc/ata.mod >> @@ -62,22 +69,42 @@ usr/lib/grub/i386-pc/boot.image >> =C2=A0usr/lib/grub/i386-pc/boot.img >> =C2=A0usr/lib/grub/i386-pc/boot.mod >> =C2=A0usr/lib/grub/i386-pc/boot.module >> +usr/lib/grub/i386-pc/boot_hybrid.image >> +usr/lib/grub/i386-pc/boot_hybrid.img >> =C2=A0usr/lib/grub/i386-pc/bsd.mod >> =C2=A0usr/lib/grub/i386-pc/bsd.module >> +usr/lib/grub/i386-pc/bswap_test.mod >> +usr/lib/grub/i386-pc/bswap_test.module >> =C2=A0usr/lib/grub/i386-pc/btrfs.mod >> =C2=A0usr/lib/grub/i386-pc/btrfs.module >> =C2=A0usr/lib/grub/i386-pc/bufio.mod >> =C2=A0usr/lib/grub/i386-pc/bufio.module >> =C2=A0usr/lib/grub/i386-pc/cat.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/cdboot.image >> =C2=A0usr/lib/grub/i386-pc/cdboot.img >> =C2=A0usr/lib/grub/i386-pc/chain.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/cmostest.mod >> =C2=A0usr/lib/grub/i386-pc/cmostest.module >> =C2=A0usr/lib/grub/i386-pc/cmp.mod >> =C2=A0usr/lib/grub/i386-pc/cmp.module >> +usr/lib/grub/i386-pc/cmp_test.mod >> +usr/lib/grub/i386-pc/cmp_test.module >> =C2=A0usr/lib/grub/i386-pc/command.lst >> =C2=A0usr/lib/grub/i386-pc/config.h >> =C2=A0usr/lib/grub/i386-pc/configfile.mod >> @@ -97,16 +124,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod >> =C2=A0usr/lib/grub/i386-pc/cryptodisk.module >> =C2=A0usr/lib/grub/i386-pc/cs5536.mod >> =C2=A0usr/lib/grub/i386-pc/cs5536.module >> +usr/lib/grub/i386-pc/ctz_test.mod >> +usr/lib/grub/i386-pc/ctz_test.module >> =C2=A0usr/lib/grub/i386-pc/date.mod >> =C2=A0usr/lib/grub/i386-pc/date.module >> =C2=A0usr/lib/grub/i386-pc/datehook.mod >> =C2=A0usr/lib/grub/i386-pc/datehook.module >> =C2=A0usr/lib/grub/i386-pc/datetime.mod >> =C2=A0usr/lib/grub/i386-pc/datetime.module >> +usr/lib/grub/i386-pc/disk.mod >> +usr/lib/grub/i386-pc/disk.module >> =C2=A0usr/lib/grub/i386-pc/diskboot.image >> =C2=A0usr/lib/grub/i386-pc/diskboot.img >> =C2=A0usr/lib/grub/i386-pc/diskfilter.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/dm_nv.mod >> =C2=A0usr/lib/grub/i386-pc/dm_nv.module >> =C2=A0usr/lib/grub/i386-pc/drivemap.mod >> @@ -115,12 +150,12 @@ usr/lib/grub/i386-pc/echo.mod >> =C2=A0usr/lib/grub/i386-pc/echo.module >> =C2=A0usr/lib/grub/i386-pc/efiemu.mod >> =C2=A0usr/lib/grub/i386-pc/efiemu.module >> -usr/lib/grub/i386-pc/efiemu32.o >> -usr/lib/grub/i386-pc/efiemu64.o >> =C2=A0usr/lib/grub/i386-pc/ehci.mod >> =C2=A0usr/lib/grub/i386-pc/ehci.module >> =C2=A0usr/lib/grub/i386-pc/elf.mod >> =C2=A0usr/lib/grub/i386-pc/elf.module >> +usr/lib/grub/i386-pc/eval.mod >> +usr/lib/grub/i386-pc/eval.module >> =C2=A0usr/lib/grub/i386-pc/exfat.mod >> =C2=A0usr/lib/grub/i386-pc/exfat.module >> =C2=A0usr/lib/grub/i386-pc/exfctest.mod >> @@ -131,6 +166,8 @@ usr/lib/grub/i386-pc/extcmd.mod >> =C2=A0usr/lib/grub/i386-pc/extcmd.module >> =C2=A0usr/lib/grub/i386-pc/fat.mod >> =C2=A0usr/lib/grub/i386-pc/fat.module >> +usr/lib/grub/i386-pc/file.mod >> +usr/lib/grub/i386-pc/file.module >> =C2=A0usr/lib/grub/i386-pc/font.mod >> =C2=A0usr/lib/grub/i386-pc/font.module >> =C2=A0usr/lib/grub/i386-pc/freedos.mod >> @@ -152,6 +189,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_crc.module >> =C2=A0usr/lib/grub/i386-pc/gcry_des.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/gcry_md4.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_md4.module >> =C2=A0usr/lib/grub/i386-pc/gcry_md5.mod >> @@ -162,6 +203,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_rijndael.module >> =C2=A0usr/lib/grub/i386-pc/gcry_rmd160.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_rmd160.module >> +usr/lib/grub/i386-pc/gcry_rsa.mod >> +usr/lib/grub/i386-pc/gcry_rsa.module >> =C2=A0usr/lib/grub/i386-pc/gcry_seed.mod >> =C2=A0usr/lib/grub/i386-pc/gcry_seed.module >> =C2=A0usr/lib/grub/i386-pc/gcry_serpent.mod >> @@ -189,6 +232,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod >> =C2=A0usr/lib/grub/i386-pc/gfxmenu.module >> =C2=A0usr/lib/grub/i386-pc/gfxterm.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/gmodule.pl >> =C2=A0usr/lib/grub/i386-pc/gptsync.mod >> =C2=A0usr/lib/grub/i386-pc/gptsync.module >> @@ -210,6 +257,8 @@ usr/lib/grub/i386-pc/hfs.mod >> =C2=A0usr/lib/grub/i386-pc/hfs.module >> =C2=A0usr/lib/grub/i386-pc/hfsplus.mod >> =C2=A0usr/lib/grub/i386-pc/hfsplus.module >> +usr/lib/grub/i386-pc/hfspluscomp.mod >> +usr/lib/grub/i386-pc/hfspluscomp.module >> =C2=A0usr/lib/grub/i386-pc/http.mod >> =C2=A0usr/lib/grub/i386-pc/http.module >> =C2=A0usr/lib/grub/i386-pc/iorw.mod >> @@ -228,6 +277,8 @@ usr/lib/grub/i386-pc/keystatus.mod >> =C2=A0usr/lib/grub/i386-pc/keystatus.module >> =C2=A0usr/lib/grub/i386-pc/ldm.mod >> =C2=A0usr/lib/grub/i386-pc/ldm.module >> +usr/lib/grub/i386-pc/legacy_password_test.mod >> +usr/lib/grub/i386-pc/legacy_password_test.module >> =C2=A0usr/lib/grub/i386-pc/legacycfg.mod >> =C2=A0usr/lib/grub/i386-pc/legacycfg.module >> =C2=A0usr/lib/grub/i386-pc/linux.mod >> @@ -258,6 +309,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image >> =C2=A0usr/lib/grub/i386-pc/lzma_decompress.img >> =C2=A0usr/lib/grub/i386-pc/lzopio.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/mdraid09.mod >> =C2=A0usr/lib/grub/i386-pc/mdraid09.module >> =C2=A0usr/lib/grub/i386-pc/mdraid09_be.mod >> @@ -286,12 +343,20 @@ usr/lib/grub/i386-pc/mmap.mod >> =C2=A0usr/lib/grub/i386-pc/mmap.module >> =C2=A0usr/lib/grub/i386-pc/moddep.lst >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/msdospart.mod >> =C2=A0usr/lib/grub/i386-pc/msdospart.module >> +usr/lib/grub/i386-pc/mul_test.mod >> +usr/lib/grub/i386-pc/mul_test.module >> =C2=A0usr/lib/grub/i386-pc/multiboot.mod >> =C2=A0usr/lib/grub/i386-pc/multiboot.module >> =C2=A0usr/lib/grub/i386-pc/multiboot2.mod >> =C2=A0usr/lib/grub/i386-pc/multiboot2.module >> +usr/lib/grub/i386-pc/nativedisk.mod >> +usr/lib/grub/i386-pc/nativedisk.module >> =C2=A0usr/lib/grub/i386-pc/net.mod >> =C2=A0usr/lib/grub/i386-pc/net.module >> =C2=A0usr/lib/grub/i386-pc/newc.mod >> @@ -308,6 +373,8 @@ usr/lib/grub/i386-pc/ntldr.mod >> =C2=A0usr/lib/grub/i386-pc/ntldr.module >> =C2=A0usr/lib/grub/i386-pc/odc.mod >> =C2=A0usr/lib/grub/i386-pc/odc.module >> +usr/lib/grub/i386-pc/offsetio.mod >> +usr/lib/grub/i386-pc/offsetio.module >> =C2=A0usr/lib/grub/i386-pc/ohci.mod >> =C2=A0usr/lib/grub/i386-pc/ohci.module >> =C2=A0usr/lib/grub/i386-pc/part_acorn.mod >> @@ -318,6 +385,8 @@ usr/lib/grub/i386-pc/part_apple.mod >> =C2=A0usr/lib/grub/i386-pc/part_apple.module >> =C2=A0usr/lib/grub/i386-pc/part_bsd.mod >> =C2=A0usr/lib/grub/i386-pc/part_bsd.module >> +usr/lib/grub/i386-pc/part_dfly.mod >> +usr/lib/grub/i386-pc/part_dfly.module >> =C2=A0usr/lib/grub/i386-pc/part_dvh.mod >> =C2=A0usr/lib/grub/i386-pc/part_dvh.module >> =C2=A0usr/lib/grub/i386-pc/part_gpt.mod >> @@ -342,8 +411,12 @@ usr/lib/grub/i386-pc/pata.mod >> =C2=A0usr/lib/grub/i386-pc/pata.module >> =C2=A0usr/lib/grub/i386-pc/pbkdf2.mod >> =C2=A0usr/lib/grub/i386-pc/pbkdf2.module >> +usr/lib/grub/i386-pc/pbkdf2_test.mod >> +usr/lib/grub/i386-pc/pbkdf2_test.module >> =C2=A0usr/lib/grub/i386-pc/pci.mod >> =C2=A0usr/lib/grub/i386-pc/pci.module >> +usr/lib/grub/i386-pc/pcidump.mod >> +usr/lib/grub/i386-pc/pcidump.module >> =C2=A0usr/lib/grub/i386-pc/plan9.mod >> =C2=A0usr/lib/grub/i386-pc/plan9.module >> =C2=A0usr/lib/grub/i386-pc/play.mod >> @@ -354,6 +427,10 @@ usr/lib/grub/i386-pc/priority_queue.mod >> =C2=A0usr/lib/grub/i386-pc/priority_queue.module >> =C2=A0usr/lib/grub/i386-pc/probe.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/pxe.mod >> =C2=A0usr/lib/grub/i386-pc/pxe.module >> =C2=A0usr/lib/grub/i386-pc/pxeboot.image >> @@ -364,6 +441,8 @@ usr/lib/grub/i386-pc/raid5rec.mod >> =C2=A0usr/lib/grub/i386-pc/raid5rec.module >> =C2=A0usr/lib/grub/i386-pc/raid6rec.mod >> =C2=A0usr/lib/grub/i386-pc/raid6rec.module >> +usr/lib/grub/i386-pc/random.mod >> +usr/lib/grub/i386-pc/random.module >> =C2=A0usr/lib/grub/i386-pc/read.mod >> =C2=A0usr/lib/grub/i386-pc/read.module >> =C2=A0usr/lib/grub/i386-pc/reboot.mod >> @@ -392,14 +471,26 @@ usr/lib/grub/i386-pc/serial.mod >> =C2=A0usr/lib/grub/i386-pc/serial.module >> =C2=A0usr/lib/grub/i386-pc/setjmp.mod >> =C2=A0usr/lib/grub/i386-pc/setjmp.module >> +usr/lib/grub/i386-pc/setjmp_test.mod >> +usr/lib/grub/i386-pc/setjmp_test.module >> =C2=A0usr/lib/grub/i386-pc/setpci.mod >> =C2=A0usr/lib/grub/i386-pc/setpci.module >> =C2=A0usr/lib/grub/i386-pc/sfs.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/sleep.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/squash4.mod >> =C2=A0usr/lib/grub/i386-pc/squash4.module >> +usr/lib/grub/i386-pc/syslinuxcfg.mod >> +usr/lib/grub/i386-pc/syslinuxcfg.module >> =C2=A0usr/lib/grub/i386-pc/tar.mod >> =C2=A0usr/lib/grub/i386-pc/tar.module >> =C2=A0usr/lib/grub/i386-pc/terminal.lst >> @@ -413,20 +504,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod >> =C2=A0usr/lib/grub/i386-pc/test_blockarg.module >> =C2=A0usr/lib/grub/i386-pc/testload.mod >> =C2=A0usr/lib/grub/i386-pc/testload.module >> +usr/lib/grub/i386-pc/testspeed.mod >> +usr/lib/grub/i386-pc/testspeed.module >> =C2=A0usr/lib/grub/i386-pc/tftp.mod >> =C2=A0usr/lib/grub/i386-pc/tftp.module >> =C2=A0usr/lib/grub/i386-pc/tga.mod >> =C2=A0usr/lib/grub/i386-pc/tga.module >> =C2=A0usr/lib/grub/i386-pc/time.mod >> =C2=A0usr/lib/grub/i386-pc/time.module >> +usr/lib/grub/i386-pc/tr.mod >> +usr/lib/grub/i386-pc/tr.module >> =C2=A0usr/lib/grub/i386-pc/trig.mod >> =C2=A0usr/lib/grub/i386-pc/trig.module >> =C2=A0usr/lib/grub/i386-pc/true.mod >> =C2=A0usr/lib/grub/i386-pc/true.module >> +usr/lib/grub/i386-pc/truecrypt.mod >> +usr/lib/grub/i386-pc/truecrypt.module >> =C2=A0usr/lib/grub/i386-pc/udf.mod >> =C2=A0usr/lib/grub/i386-pc/udf.module >> =C2=A0usr/lib/grub/i386-pc/ufs1.mod >> =C2=A0usr/lib/grub/i386-pc/ufs1.module >> +usr/lib/grub/i386-pc/ufs1_be.mod >> +usr/lib/grub/i386-pc/ufs1_be.module >> =C2=A0usr/lib/grub/i386-pc/ufs2.mod >> =C2=A0usr/lib/grub/i386-pc/ufs2.module >> =C2=A0usr/lib/grub/i386-pc/uhci.mod >> @@ -443,10 +542,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod >> =C2=A0usr/lib/grub/i386-pc/usbserial_ftdi.module >> =C2=A0usr/lib/grub/i386-pc/usbserial_pl2303.mod >> =C2=A0usr/lib/grub/i386-pc/usbserial_pl2303.module >> +usr/lib/grub/i386-pc/usbserial_usbdebug.mod >> +usr/lib/grub/i386-pc/usbserial_usbdebug.module >> =C2=A0usr/lib/grub/i386-pc/usbtest.mod >> =C2=A0usr/lib/grub/i386-pc/usbtest.module >> =C2=A0usr/lib/grub/i386-pc/vbe.mod >> =C2=A0usr/lib/grub/i386-pc/vbe.module >> +usr/lib/grub/i386-pc/verify.mod >> +usr/lib/grub/i386-pc/verify.module >> =C2=A0usr/lib/grub/i386-pc/vga.mod >> =C2=A0usr/lib/grub/i386-pc/vga.module >> =C2=A0usr/lib/grub/i386-pc/vga_text.mod >> @@ -458,18 +561,24 @@ usr/lib/grub/i386-pc/video_bochs.mod >> =C2=A0usr/lib/grub/i386-pc/video_bochs.module >> =C2=A0usr/lib/grub/i386-pc/video_cirrus.mod >> =C2=A0usr/lib/grub/i386-pc/video_cirrus.module >> +usr/lib/grub/i386-pc/video_colors.mod >> +usr/lib/grub/i386-pc/video_colors.module >> =C2=A0usr/lib/grub/i386-pc/video_fb.mod >> =C2=A0usr/lib/grub/i386-pc/video_fb.module >> =C2=A0usr/lib/grub/i386-pc/videoinfo.mod >> =C2=A0usr/lib/grub/i386-pc/videoinfo.module >> =C2=A0usr/lib/grub/i386-pc/videotest.mod >> =C2=A0usr/lib/grub/i386-pc/videotest.module >> +usr/lib/grub/i386-pc/videotest_checksum.mod >> +usr/lib/grub/i386-pc/videotest_checksum.module >> =C2=A0usr/lib/grub/i386-pc/xfs.mod >> =C2=A0usr/lib/grub/i386-pc/xfs.module >> =C2=A0usr/lib/grub/i386-pc/xnu.mod >> =C2=A0usr/lib/grub/i386-pc/xnu.module >> =C2=A0usr/lib/grub/i386-pc/xnu_uuid.mod >> =C2=A0usr/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 >> =C2=A0usr/lib/grub/i386-pc/xzio.mod >> =C2=A0usr/lib/grub/i386-pc/xzio.module >> =C2=A0usr/lib/grub/i386-pc/zfs.mod >> @@ -480,8 +589,8 @@ usr/lib/grub/i386-pc/zfsinfo.mod >> =C2=A0usr/lib/grub/i386-pc/zfsinfo.module >> =C2=A0usr/sbin/grub-bios-setup >> =C2=A0usr/sbin/grub-install >> +usr/sbin/grub-macbless >> =C2=A0usr/sbin/grub-mkconfig >> -usr/sbin/grub-mknetdir >> =C2=A0usr/sbin/grub-ofpathname >> =C2=A0usr/sbin/grub-probe >> =C2=A0usr/sbin/grub-reboot >> @@ -520,19 +629,29 @@ usr/share/grub/grub-mkconfig_lib >> =C2=A0#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/eo/LC_MESSAGES/grub.mo >> +#usr/share/locale/es/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/fi/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/fr/LC_MESSAGES/grub.mo >> +#usr/share/locale/gl/LC_MESSAGES/grub.mo >> +#usr/share/locale/hr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/hu/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/id/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/it/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/ja/LC_MESSAGES/grub.mo >> +#usr/share/locale/ko/LC_MESSAGES/grub.mo >> +#usr/share/locale/lt/LC_MESSAGES/grub.mo >> +#usr/share/locale/nb/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/nl/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/pa >> =C2=A0#usr/share/locale/pa/LC_MESSAGES >> =C2=A0#usr/share/locale/pa/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/pl/LC_MESSAGES/grub.mo >> +#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/ru/LC_MESSAGES/grub.mo >> +#usr/share/locale/sl/LC_MESSAGES/grub.mo >> +#usr/share/locale/sr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/sv/LC_MESSAGES/grub.mo >> +#usr/share/locale/tr/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/uk/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/vi/LC_MESSAGES/grub.mo >> =C2=A0#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo >> diff --git a/lfs/grub b/lfs/grub >> index a054b8e..f7bce5d 100644 >> --- a/lfs/grub >> +++ b/lfs/grub >> @@ -1,7 +1,7 @@ >> =C2=A0####################################################################= ######### >> ## >> =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 >> =C2=A0# >> =C2=A0# IPFire.org - A linux based >> firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> -# Copyright (C) 2007-2015=C2=A0=C2=A0IPFire=20 >> Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 >> =C2=A0# >> +# Copyright (C) 2007-2016 IPFire=20 >> Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 >> =C2=A0# >> =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 >> =C2=A0# >> =C2=A0# This program is free software: you can redistribute it and/or >> modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> =C2=A0# it under the terms of the GNU General Public License as published >> by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# >> @@ -24,7 +24,7 @@ >> =C2=A0 >> =C2=A0include Config >> =C2=A0 >> -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.00 >> +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 2.02 >> =C2=A0 >> =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D grub-$(VER) >> =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz >> @@ -41,13 +41,13 @@ CXXFLAGS=C2=A0=C2=A0=C2=A0=3D >> =C2=A0####################################################################= ######### >> ## >> =C2=A0 >> =C2=A0objects =3D $(DL_FILE) \ >> - unifont-7.0.03.pcf.gz >> + unifont-9.0.02.pcf.gz >> =C2=A0 >> =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> -unifont-7.0.03.pcf.gz =3D $(DL_FROM)/unifont-7.0.03.pcf.gz >> +unifont-9.0.02.pcf.gz =3D $(DL_FROM)/unifont-9.0.02.pcf.gz >> =C2=A0 >> -$(DL_FILE)_MD5 =3D a1043102fbc7bcedbf53e7ee3d17ab91 >> -unifont-7.0.03.pcf.gz_MD5 =3D f6903ac8c1caeeb30c1e9a2975028401 >> +$(DL_FILE)_MD5 =3D 8a4a2a95aac551fb0fba860ceabfa1d3 >> +unifont-9.0.02.pcf.gz_MD5 =3D 8819d828361a6b70dcac793c1ec235bb >> =C2=A0 >> =C2=A0install : $(TARGET) >> =C2=A0 >> @@ -57,6 +57,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> =C2=A0 >> =C2=A0md5 : $(subst %,%_MD5,$(objects)) >> =C2=A0 >> + >> =C2=A0####################################################################= ######### >> ## >> =C2=A0# Downloading, checking, md5sum >> =C2=A0####################################################################= ######### >> ## >> @@ -77,15 +78,14 @@ $(subst %,%_MD5,$(objects)) : >> =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> =C2=A0 @$(PREBUILD) >> =C2=A0 @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) && patch -Np1 < $(DIR_SRC)/src/patches/grub2-remove- >> gets.patch >> =C2=A0 cd $(DIR_APP) && \ >> =C2=A0 ./configure \ >> =C2=A0 --prefix=3D/usr \ >> =C2=A0 --sysconfdir=3D/etc \ >> =C2=A0 --with-platform=3Dpc \ >> =C2=A0 --with-grubdir=3Dgrub \ >> + --disable-efiemu \ >> + --disable-grub-emu-usb \ >> =C2=A0 --program-transform-name=3Ds,grub,grub, \ >> =C2=A0 --disable-grub-mount \ >> =C2=A0 --disable-werror >> @@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> =C2=A0 # converts Latin-1, Latin Extended A+B, Arrows, Box and Block >> characters. >> =C2=A0 /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \ >> =C2=A0 --range=3D0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \ >> - $(DIR_DL)/unifont-7.0.03.pcf.gz >> + $(DIR_DL)/unifont-9.0.02.pcf.gz >> =C2=A0 >> =C2=A0 @rm -rf $(DIR_APP) >> =C2=A0 @$(POSTBUILD) >> diff --git a/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass- >> vulnerability.patch=20 >> b/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass- >> vulnerability.patch >> deleted file mode 100644 >> index 2eef1ae..0000000 >> ---=20 >> a/src/patches/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch >> +++ /dev/null >> @@ -1,45 +0,0 @@ >> -From 88c9657960a6c5d3673a25c266781e876c181add Mon Sep 17 00:00:00=20 >> 2001 >> -From: Hector Marco-Gisbert >> -Date: Fri, 13 Nov 2015 16:21:09 +0100 >> -Subject: [PATCH] Fix security issue when reading username and=20 >> password >> - >> -=C2=A0=C2=A0This patch fixes two integer underflows at: >> -=C2=A0=C2=A0=C2=A0=C2=A0* grub-core/lib/crypto.c >> -=C2=A0=C2=A0=C2=A0=C2=A0* grub-core/normal/auth.c >> - >> -Signed-off-by: Hector Marco-Gisbert >> -Signed-off-by: Ismael Ripoll-Ripoll >> ---- >> - grub-core/lib/crypto.c=C2=A0=C2=A0| 2 +- >> - grub-core/normal/auth.c | 2 +- >> - 2 files changed, 2 insertions(+), 2 deletions(-) >> - >> -diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c >> -index 010e550..524a3d8 100644 >> ---- a/grub-core/lib/crypto.c >> -+++ b/grub-core/lib/crypto.c >> -@@ -456,7 +456,7 @@ grub_password_get (char buf[], unsigned buf_size) >> -=C2=A0 =C2=A0=C2=A0break; >> -=C2=A0 } >> -=C2=A0 >> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (key =3D=3D '\b') >> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (key =3D=3D '\b' && cur_len) >> -=C2=A0 { >> -=C2=A0 =C2=A0=C2=A0cur_len--; >> -=C2=A0 =C2=A0=C2=A0continue; >> -diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c >> -index c6bd96e..5782ec5 100644 >> ---- a/grub-core/normal/auth.c >> -+++ b/grub-core/normal/auth.c >> -@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size) >> -=C2=A0 =C2=A0=C2=A0break; >> -=C2=A0 } >> -=C2=A0 >> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (key =3D=3D '\b') >> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (key =3D=3D '\b' && cur_len) >> -=C2=A0 { >> -=C2=A0 =C2=A0=C2=A0cur_len--; >> -=C2=A0 =C2=A0=C2=A0grub_printf ("\b"); >> ---=C2=A0 >> -1.9.1 >> - >> 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=20 >> and >> other >> -new intel onboard graphics. >> - >> -diff -Naur grub-2.00.org/grub-core/video/i386/pc/vga.c=20 >> 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 @@ >> - { >> -=C2=A0=C2=A0=C2=A0grub_err_t err; >> -=C2=A0 >> --=C2=A0=C2=A0if ((width && width !=3D VGA_WIDTH) || (height && height != =3D=20 >> VGA_HEIGHT)) >> -+//=C2=A0=C2=A0if ((width && width !=3D VGA_WIDTH) || (height && height != =3D=20 >> VGA_HEIGHT)) >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return grub_error (GRUB_ERR_UNKNOWN_DEVICE,= "no matching mode=20 >> found"); >> -=C2=A0 >> -=C2=A0=C2=A0=C2=A0framebuffer.temporary_buffer =3D grub_malloc (VGA_HEIGH= T *=20 >> VGA_WIDTH); >> diff --git a/src/patches/grub2-remove-gets.patch=20 >> b/src/patches/grub2-remove- >> gets.patch >> deleted file mode 100644 >> index 0da71b3..0000000 >> --- a/src/patches/grub2-remove-gets.patch >> +++ /dev/null >> @@ -1,21 +0,0 @@ >> -ISO C11 removes the specification of gets() from the C language,=20 >> eglibc 2.16+ >> removed it >> - >> -Signed-off-by: Khem Raj >> -Signed-off-by: Thomas Petazzoni >> - >> -Upstream-Status: Pending >> -Index: grub-1.99/grub-core/gnulib/stdio.in.h >> -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> ---- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 >> 06:45:43.000000000 -0800 >> -+++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 >> 12:25:02.057099107 -0700 >> -@@ -140,8 +140,10 @@ >> - /* It is very rare that the developer ever has full control of=20 >> stdin, >> -=C2=A0=C2=A0=C2=A0=C2=A0so any use of gets warrants an unconditional warn= ing.=C2=A0=C2=A0Assume it=20 >> is >> -=C2=A0=C2=A0=C2=A0=C2=A0always declared, since it is required by C89.=C2= =A0=C2=A0*/ >> -+#if defined gets >> - #undef gets >> - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets=20 >> instead"); >> -+#endif >> -=C2=A0 >> - #if @GNULIB_FOPEN@ >> - # if @REPLACE_FOPEN@ --===============9011277959516757539==--