From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Aug 2015 20:18:18 +0000 (+0100)
Subject: Enhance the flash image to support EFI
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4655c37a31162da4c0edfdaeaff5b1ce17f00ae0;p=people%2Fms%2Fipfire-2.x.git

Enhance the flash image to support EFI

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub
index 6cd8a4dca3..16e76aa0fc 100644
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@ -1,3 +1,9 @@
+#boot/efi
+#boot/efi/EFI
+#boot/efi/EFI/ipfire
+#boot/efi/EFI/ipfire/grub-efi
+boot/efi/EFI/ipfire/grub-efi/grub.cfg
+boot/efi/EFI/ipfire/grub-efi/grub.efi
 #boot/grub
 boot/grub/grub.cfg
 boot/grub/splash.png
@@ -12,8 +18,7 @@ etc/grub.d/20_linux_xen
 etc/grub.d/30_os-prober
 etc/grub.d/40_custom
 etc/grub.d/41_custom
-etc/grub.d/README
-etc/grub2.cfg
+#etc/grub.d/README
 usr/bin/grub-editenv
 usr/bin/grub-file
 usr/bin/grub-fstest
@@ -32,6 +37,429 @@ usr/bin/grub-render-label
 usr/bin/grub-script-check
 usr/bin/grub-syslinux2cfg
 #usr/lib/grub
+usr/lib/grub
+usr/lib/grub/i386-efi
+usr/lib/grub/i386-efi/acpi.mod
+usr/lib/grub/i386-efi/acpi.module
+usr/lib/grub/i386-efi/adler32.mod
+usr/lib/grub/i386-efi/adler32.module
+usr/lib/grub/i386-efi/affs.mod
+usr/lib/grub/i386-efi/affs.module
+usr/lib/grub/i386-efi/afs.mod
+usr/lib/grub/i386-efi/afs.module
+usr/lib/grub/i386-efi/ahci.mod
+usr/lib/grub/i386-efi/ahci.module
+usr/lib/grub/i386-efi/all_video.mod
+usr/lib/grub/i386-efi/all_video.module
+usr/lib/grub/i386-efi/aout.mod
+usr/lib/grub/i386-efi/aout.module
+usr/lib/grub/i386-efi/appleldr.mod
+usr/lib/grub/i386-efi/appleldr.module
+usr/lib/grub/i386-efi/at_keyboard.mod
+usr/lib/grub/i386-efi/at_keyboard.module
+usr/lib/grub/i386-efi/ata.mod
+usr/lib/grub/i386-efi/ata.module
+usr/lib/grub/i386-efi/backtrace.mod
+usr/lib/grub/i386-efi/backtrace.module
+usr/lib/grub/i386-efi/bfs.mod
+usr/lib/grub/i386-efi/bfs.module
+usr/lib/grub/i386-efi/bitmap.mod
+usr/lib/grub/i386-efi/bitmap.module
+usr/lib/grub/i386-efi/bitmap_scale.mod
+usr/lib/grub/i386-efi/bitmap_scale.module
+usr/lib/grub/i386-efi/blocklist.mod
+usr/lib/grub/i386-efi/blocklist.module
+usr/lib/grub/i386-efi/boot.mod
+usr/lib/grub/i386-efi/boot.module
+usr/lib/grub/i386-efi/bsd.mod
+usr/lib/grub/i386-efi/bsd.module
+usr/lib/grub/i386-efi/btrfs.mod
+usr/lib/grub/i386-efi/btrfs.module
+usr/lib/grub/i386-efi/bufio.mod
+usr/lib/grub/i386-efi/bufio.module
+usr/lib/grub/i386-efi/cat.mod
+usr/lib/grub/i386-efi/cat.module
+usr/lib/grub/i386-efi/chain.mod
+usr/lib/grub/i386-efi/chain.module
+usr/lib/grub/i386-efi/cmp.mod
+usr/lib/grub/i386-efi/cmp.module
+usr/lib/grub/i386-efi/command.lst
+usr/lib/grub/i386-efi/config.h
+usr/lib/grub/i386-efi/configfile.mod
+usr/lib/grub/i386-efi/configfile.module
+usr/lib/grub/i386-efi/cpio.mod
+usr/lib/grub/i386-efi/cpio.module
+usr/lib/grub/i386-efi/cpio_be.mod
+usr/lib/grub/i386-efi/cpio_be.module
+usr/lib/grub/i386-efi/cpuid.mod
+usr/lib/grub/i386-efi/cpuid.module
+usr/lib/grub/i386-efi/crc64.mod
+usr/lib/grub/i386-efi/crc64.module
+usr/lib/grub/i386-efi/crypto.lst
+usr/lib/grub/i386-efi/crypto.mod
+usr/lib/grub/i386-efi/crypto.module
+usr/lib/grub/i386-efi/cryptodisk.mod
+usr/lib/grub/i386-efi/cryptodisk.module
+usr/lib/grub/i386-efi/cs5536.mod
+usr/lib/grub/i386-efi/cs5536.module
+usr/lib/grub/i386-efi/date.mod
+usr/lib/grub/i386-efi/date.module
+usr/lib/grub/i386-efi/datehook.mod
+usr/lib/grub/i386-efi/datehook.module
+usr/lib/grub/i386-efi/datetime.mod
+usr/lib/grub/i386-efi/datetime.module
+usr/lib/grub/i386-efi/diskfilter.mod
+usr/lib/grub/i386-efi/diskfilter.module
+usr/lib/grub/i386-efi/dm_nv.mod
+usr/lib/grub/i386-efi/dm_nv.module
+usr/lib/grub/i386-efi/echo.mod
+usr/lib/grub/i386-efi/echo.module
+usr/lib/grub/i386-efi/efi_gop.mod
+usr/lib/grub/i386-efi/efi_gop.module
+usr/lib/grub/i386-efi/efi_uga.mod
+usr/lib/grub/i386-efi/efi_uga.module
+usr/lib/grub/i386-efi/efinet.mod
+usr/lib/grub/i386-efi/efinet.module
+usr/lib/grub/i386-efi/ehci.mod
+usr/lib/grub/i386-efi/ehci.module
+usr/lib/grub/i386-efi/elf.mod
+usr/lib/grub/i386-efi/elf.module
+usr/lib/grub/i386-efi/exfat.mod
+usr/lib/grub/i386-efi/exfat.module
+usr/lib/grub/i386-efi/exfctest.mod
+usr/lib/grub/i386-efi/exfctest.module
+usr/lib/grub/i386-efi/ext2.mod
+usr/lib/grub/i386-efi/ext2.module
+usr/lib/grub/i386-efi/extcmd.mod
+usr/lib/grub/i386-efi/extcmd.module
+usr/lib/grub/i386-efi/fat.mod
+usr/lib/grub/i386-efi/fat.module
+usr/lib/grub/i386-efi/fixvideo.mod
+usr/lib/grub/i386-efi/fixvideo.module
+usr/lib/grub/i386-efi/font.mod
+usr/lib/grub/i386-efi/font.module
+usr/lib/grub/i386-efi/fs.lst
+usr/lib/grub/i386-efi/fshelp.mod
+usr/lib/grub/i386-efi/fshelp.module
+usr/lib/grub/i386-efi/functional_test.mod
+usr/lib/grub/i386-efi/functional_test.module
+usr/lib/grub/i386-efi/gcry_arcfour.mod
+usr/lib/grub/i386-efi/gcry_arcfour.module
+usr/lib/grub/i386-efi/gcry_blowfish.mod
+usr/lib/grub/i386-efi/gcry_blowfish.module
+usr/lib/grub/i386-efi/gcry_camellia.mod
+usr/lib/grub/i386-efi/gcry_camellia.module
+usr/lib/grub/i386-efi/gcry_cast5.mod
+usr/lib/grub/i386-efi/gcry_cast5.module
+usr/lib/grub/i386-efi/gcry_crc.mod
+usr/lib/grub/i386-efi/gcry_crc.module
+usr/lib/grub/i386-efi/gcry_des.mod
+usr/lib/grub/i386-efi/gcry_des.module
+usr/lib/grub/i386-efi/gcry_md4.mod
+usr/lib/grub/i386-efi/gcry_md4.module
+usr/lib/grub/i386-efi/gcry_md5.mod
+usr/lib/grub/i386-efi/gcry_md5.module
+usr/lib/grub/i386-efi/gcry_rfc2268.mod
+usr/lib/grub/i386-efi/gcry_rfc2268.module
+usr/lib/grub/i386-efi/gcry_rijndael.mod
+usr/lib/grub/i386-efi/gcry_rijndael.module
+usr/lib/grub/i386-efi/gcry_rmd160.mod
+usr/lib/grub/i386-efi/gcry_rmd160.module
+usr/lib/grub/i386-efi/gcry_seed.mod
+usr/lib/grub/i386-efi/gcry_seed.module
+usr/lib/grub/i386-efi/gcry_serpent.mod
+usr/lib/grub/i386-efi/gcry_serpent.module
+usr/lib/grub/i386-efi/gcry_sha1.mod
+usr/lib/grub/i386-efi/gcry_sha1.module
+usr/lib/grub/i386-efi/gcry_sha256.mod
+usr/lib/grub/i386-efi/gcry_sha256.module
+usr/lib/grub/i386-efi/gcry_sha512.mod
+usr/lib/grub/i386-efi/gcry_sha512.module
+usr/lib/grub/i386-efi/gcry_tiger.mod
+usr/lib/grub/i386-efi/gcry_tiger.module
+usr/lib/grub/i386-efi/gcry_twofish.mod
+usr/lib/grub/i386-efi/gcry_twofish.module
+usr/lib/grub/i386-efi/gcry_whirlpool.mod
+usr/lib/grub/i386-efi/gcry_whirlpool.module
+usr/lib/grub/i386-efi/gdb.mod
+usr/lib/grub/i386-efi/gdb.module
+usr/lib/grub/i386-efi/gdb_grub
+usr/lib/grub/i386-efi/geli.mod
+usr/lib/grub/i386-efi/geli.module
+usr/lib/grub/i386-efi/gettext.mod
+usr/lib/grub/i386-efi/gettext.module
+usr/lib/grub/i386-efi/gfxmenu.mod
+usr/lib/grub/i386-efi/gfxmenu.module
+usr/lib/grub/i386-efi/gfxterm.mod
+usr/lib/grub/i386-efi/gfxterm.module
+usr/lib/grub/i386-efi/gmodule.pl
+usr/lib/grub/i386-efi/gptsync.mod
+usr/lib/grub/i386-efi/gptsync.module
+usr/lib/grub/i386-efi/gzio.mod
+usr/lib/grub/i386-efi/gzio.module
+usr/lib/grub/i386-efi/halt.mod
+usr/lib/grub/i386-efi/halt.module
+usr/lib/grub/i386-efi/hashsum.mod
+usr/lib/grub/i386-efi/hashsum.module
+usr/lib/grub/i386-efi/hdparm.mod
+usr/lib/grub/i386-efi/hdparm.module
+usr/lib/grub/i386-efi/hello.mod
+usr/lib/grub/i386-efi/hello.module
+usr/lib/grub/i386-efi/help.mod
+usr/lib/grub/i386-efi/help.module
+usr/lib/grub/i386-efi/hexdump.mod
+usr/lib/grub/i386-efi/hexdump.module
+usr/lib/grub/i386-efi/hfs.mod
+usr/lib/grub/i386-efi/hfs.module
+usr/lib/grub/i386-efi/hfsplus.mod
+usr/lib/grub/i386-efi/hfsplus.module
+usr/lib/grub/i386-efi/http.mod
+usr/lib/grub/i386-efi/http.module
+usr/lib/grub/i386-efi/iorw.mod
+usr/lib/grub/i386-efi/iorw.module
+usr/lib/grub/i386-efi/iso9660.mod
+usr/lib/grub/i386-efi/iso9660.module
+usr/lib/grub/i386-efi/jfs.mod
+usr/lib/grub/i386-efi/jfs.module
+usr/lib/grub/i386-efi/jpeg.mod
+usr/lib/grub/i386-efi/jpeg.module
+usr/lib/grub/i386-efi/kernel.exec
+usr/lib/grub/i386-efi/kernel.img
+usr/lib/grub/i386-efi/keylayouts.mod
+usr/lib/grub/i386-efi/keylayouts.module
+usr/lib/grub/i386-efi/keystatus.mod
+usr/lib/grub/i386-efi/keystatus.module
+usr/lib/grub/i386-efi/ldm.mod
+usr/lib/grub/i386-efi/ldm.module
+usr/lib/grub/i386-efi/linux.mod
+usr/lib/grub/i386-efi/linux.module
+usr/lib/grub/i386-efi/loadbios.mod
+usr/lib/grub/i386-efi/loadbios.module
+usr/lib/grub/i386-efi/loadenv.mod
+usr/lib/grub/i386-efi/loadenv.module
+usr/lib/grub/i386-efi/loopback.mod
+usr/lib/grub/i386-efi/loopback.module
+usr/lib/grub/i386-efi/ls.mod
+usr/lib/grub/i386-efi/ls.module
+usr/lib/grub/i386-efi/lsacpi.mod
+usr/lib/grub/i386-efi/lsacpi.module
+usr/lib/grub/i386-efi/lsefimmap.mod
+usr/lib/grub/i386-efi/lsefimmap.module
+usr/lib/grub/i386-efi/lsefisystab.mod
+usr/lib/grub/i386-efi/lsefisystab.module
+usr/lib/grub/i386-efi/lsmmap.mod
+usr/lib/grub/i386-efi/lsmmap.module
+usr/lib/grub/i386-efi/lspci.mod
+usr/lib/grub/i386-efi/lspci.module
+usr/lib/grub/i386-efi/lssal.mod
+usr/lib/grub/i386-efi/lssal.module
+usr/lib/grub/i386-efi/luks.mod
+usr/lib/grub/i386-efi/luks.module
+usr/lib/grub/i386-efi/lvm.mod
+usr/lib/grub/i386-efi/lvm.module
+usr/lib/grub/i386-efi/lzopio.mod
+usr/lib/grub/i386-efi/lzopio.module
+usr/lib/grub/i386-efi/mdraid09.mod
+usr/lib/grub/i386-efi/mdraid09.module
+usr/lib/grub/i386-efi/mdraid09_be.mod
+usr/lib/grub/i386-efi/mdraid09_be.module
+usr/lib/grub/i386-efi/mdraid1x.mod
+usr/lib/grub/i386-efi/mdraid1x.module
+usr/lib/grub/i386-efi/memdisk.mod
+usr/lib/grub/i386-efi/memdisk.module
+usr/lib/grub/i386-efi/memrw.mod
+usr/lib/grub/i386-efi/memrw.module
+usr/lib/grub/i386-efi/minicmd.mod
+usr/lib/grub/i386-efi/minicmd.module
+usr/lib/grub/i386-efi/minix.mod
+usr/lib/grub/i386-efi/minix.module
+usr/lib/grub/i386-efi/minix2.mod
+usr/lib/grub/i386-efi/minix2.module
+usr/lib/grub/i386-efi/minix2_be.mod
+usr/lib/grub/i386-efi/minix2_be.module
+usr/lib/grub/i386-efi/minix3.mod
+usr/lib/grub/i386-efi/minix3.module
+usr/lib/grub/i386-efi/minix3_be.mod
+usr/lib/grub/i386-efi/minix3_be.module
+usr/lib/grub/i386-efi/minix_be.mod
+usr/lib/grub/i386-efi/minix_be.module
+usr/lib/grub/i386-efi/mmap.mod
+usr/lib/grub/i386-efi/mmap.module
+usr/lib/grub/i386-efi/moddep.lst
+usr/lib/grub/i386-efi/modinfo.sh
+usr/lib/grub/i386-efi/msdospart.mod
+usr/lib/grub/i386-efi/msdospart.module
+usr/lib/grub/i386-efi/multiboot.mod
+usr/lib/grub/i386-efi/multiboot.module
+usr/lib/grub/i386-efi/multiboot2.mod
+usr/lib/grub/i386-efi/multiboot2.module
+usr/lib/grub/i386-efi/net.mod
+usr/lib/grub/i386-efi/net.module
+usr/lib/grub/i386-efi/newc.mod
+usr/lib/grub/i386-efi/newc.module
+usr/lib/grub/i386-efi/nilfs2.mod
+usr/lib/grub/i386-efi/nilfs2.module
+usr/lib/grub/i386-efi/normal.mod
+usr/lib/grub/i386-efi/normal.module
+usr/lib/grub/i386-efi/ntfs.mod
+usr/lib/grub/i386-efi/ntfs.module
+usr/lib/grub/i386-efi/ntfscomp.mod
+usr/lib/grub/i386-efi/ntfscomp.module
+usr/lib/grub/i386-efi/odc.mod
+usr/lib/grub/i386-efi/odc.module
+usr/lib/grub/i386-efi/ohci.mod
+usr/lib/grub/i386-efi/ohci.module
+usr/lib/grub/i386-efi/part_acorn.mod
+usr/lib/grub/i386-efi/part_acorn.module
+usr/lib/grub/i386-efi/part_amiga.mod
+usr/lib/grub/i386-efi/part_amiga.module
+usr/lib/grub/i386-efi/part_apple.mod
+usr/lib/grub/i386-efi/part_apple.module
+usr/lib/grub/i386-efi/part_bsd.mod
+usr/lib/grub/i386-efi/part_bsd.module
+usr/lib/grub/i386-efi/part_dvh.mod
+usr/lib/grub/i386-efi/part_dvh.module
+usr/lib/grub/i386-efi/part_gpt.mod
+usr/lib/grub/i386-efi/part_gpt.module
+usr/lib/grub/i386-efi/part_msdos.mod
+usr/lib/grub/i386-efi/part_msdos.module
+usr/lib/grub/i386-efi/part_plan.mod
+usr/lib/grub/i386-efi/part_plan.module
+usr/lib/grub/i386-efi/part_sun.mod
+usr/lib/grub/i386-efi/part_sun.module
+usr/lib/grub/i386-efi/part_sunpc.mod
+usr/lib/grub/i386-efi/part_sunpc.module
+usr/lib/grub/i386-efi/partmap.lst
+usr/lib/grub/i386-efi/parttool.lst
+usr/lib/grub/i386-efi/parttool.mod
+usr/lib/grub/i386-efi/parttool.module
+usr/lib/grub/i386-efi/password.mod
+usr/lib/grub/i386-efi/password.module
+usr/lib/grub/i386-efi/password_pbkdf2.mod
+usr/lib/grub/i386-efi/password_pbkdf2.module
+usr/lib/grub/i386-efi/pata.mod
+usr/lib/grub/i386-efi/pata.module
+usr/lib/grub/i386-efi/pbkdf2.mod
+usr/lib/grub/i386-efi/pbkdf2.module
+usr/lib/grub/i386-efi/play.mod
+usr/lib/grub/i386-efi/play.module
+usr/lib/grub/i386-efi/png.mod
+usr/lib/grub/i386-efi/png.module
+usr/lib/grub/i386-efi/priority_queue.mod
+usr/lib/grub/i386-efi/priority_queue.module
+usr/lib/grub/i386-efi/probe.mod
+usr/lib/grub/i386-efi/probe.module
+usr/lib/grub/i386-efi/raid5rec.mod
+usr/lib/grub/i386-efi/raid5rec.module
+usr/lib/grub/i386-efi/raid6rec.mod
+usr/lib/grub/i386-efi/raid6rec.module
+usr/lib/grub/i386-efi/read.mod
+usr/lib/grub/i386-efi/read.module
+usr/lib/grub/i386-efi/reboot.mod
+usr/lib/grub/i386-efi/reboot.module
+usr/lib/grub/i386-efi/regexp.mod
+usr/lib/grub/i386-efi/regexp.module
+usr/lib/grub/i386-efi/reiserfs.mod
+usr/lib/grub/i386-efi/reiserfs.module
+usr/lib/grub/i386-efi/relocator.mod
+usr/lib/grub/i386-efi/relocator.module
+usr/lib/grub/i386-efi/romfs.mod
+usr/lib/grub/i386-efi/romfs.module
+usr/lib/grub/i386-efi/scsi.mod
+usr/lib/grub/i386-efi/scsi.module
+usr/lib/grub/i386-efi/search.mod
+usr/lib/grub/i386-efi/search.module
+usr/lib/grub/i386-efi/search_fs_file.mod
+usr/lib/grub/i386-efi/search_fs_file.module
+usr/lib/grub/i386-efi/search_fs_uuid.mod
+usr/lib/grub/i386-efi/search_fs_uuid.module
+usr/lib/grub/i386-efi/search_label.mod
+usr/lib/grub/i386-efi/search_label.module
+usr/lib/grub/i386-efi/serial.mod
+usr/lib/grub/i386-efi/serial.module
+usr/lib/grub/i386-efi/setjmp.mod
+usr/lib/grub/i386-efi/setjmp.module
+usr/lib/grub/i386-efi/setpci.mod
+usr/lib/grub/i386-efi/setpci.module
+usr/lib/grub/i386-efi/sfs.mod
+usr/lib/grub/i386-efi/sfs.module
+usr/lib/grub/i386-efi/sleep.mod
+usr/lib/grub/i386-efi/sleep.module
+usr/lib/grub/i386-efi/squash4.mod
+usr/lib/grub/i386-efi/squash4.module
+usr/lib/grub/i386-efi/tar.mod
+usr/lib/grub/i386-efi/tar.module
+usr/lib/grub/i386-efi/terminal.lst
+usr/lib/grub/i386-efi/terminal.mod
+usr/lib/grub/i386-efi/terminal.module
+usr/lib/grub/i386-efi/terminfo.mod
+usr/lib/grub/i386-efi/terminfo.module
+usr/lib/grub/i386-efi/test.mod
+usr/lib/grub/i386-efi/test.module
+usr/lib/grub/i386-efi/test_blockarg.mod
+usr/lib/grub/i386-efi/test_blockarg.module
+usr/lib/grub/i386-efi/testload.mod
+usr/lib/grub/i386-efi/testload.module
+usr/lib/grub/i386-efi/tftp.mod
+usr/lib/grub/i386-efi/tftp.module
+usr/lib/grub/i386-efi/tga.mod
+usr/lib/grub/i386-efi/tga.module
+usr/lib/grub/i386-efi/time.mod
+usr/lib/grub/i386-efi/time.module
+usr/lib/grub/i386-efi/trig.mod
+usr/lib/grub/i386-efi/trig.module
+usr/lib/grub/i386-efi/true.mod
+usr/lib/grub/i386-efi/true.module
+usr/lib/grub/i386-efi/udf.mod
+usr/lib/grub/i386-efi/udf.module
+usr/lib/grub/i386-efi/ufs1.mod
+usr/lib/grub/i386-efi/ufs1.module
+usr/lib/grub/i386-efi/ufs2.mod
+usr/lib/grub/i386-efi/ufs2.module
+usr/lib/grub/i386-efi/uhci.mod
+usr/lib/grub/i386-efi/uhci.module
+usr/lib/grub/i386-efi/usb.mod
+usr/lib/grub/i386-efi/usb.module
+usr/lib/grub/i386-efi/usb_keyboard.mod
+usr/lib/grub/i386-efi/usb_keyboard.module
+usr/lib/grub/i386-efi/usbms.mod
+usr/lib/grub/i386-efi/usbms.module
+usr/lib/grub/i386-efi/usbserial_common.mod
+usr/lib/grub/i386-efi/usbserial_common.module
+usr/lib/grub/i386-efi/usbserial_ftdi.mod
+usr/lib/grub/i386-efi/usbserial_ftdi.module
+usr/lib/grub/i386-efi/usbserial_pl2303.mod
+usr/lib/grub/i386-efi/usbserial_pl2303.module
+usr/lib/grub/i386-efi/usbtest.mod
+usr/lib/grub/i386-efi/usbtest.module
+usr/lib/grub/i386-efi/video.lst
+usr/lib/grub/i386-efi/video.mod
+usr/lib/grub/i386-efi/video.module
+usr/lib/grub/i386-efi/video_bochs.mod
+usr/lib/grub/i386-efi/video_bochs.module
+usr/lib/grub/i386-efi/video_cirrus.mod
+usr/lib/grub/i386-efi/video_cirrus.module
+usr/lib/grub/i386-efi/video_fb.mod
+usr/lib/grub/i386-efi/video_fb.module
+usr/lib/grub/i386-efi/videoinfo.mod
+usr/lib/grub/i386-efi/videoinfo.module
+usr/lib/grub/i386-efi/videotest.mod
+usr/lib/grub/i386-efi/videotest.module
+usr/lib/grub/i386-efi/xfs.mod
+usr/lib/grub/i386-efi/xfs.module
+usr/lib/grub/i386-efi/xnu.mod
+usr/lib/grub/i386-efi/xnu.module
+usr/lib/grub/i386-efi/xnu_uuid.mod
+usr/lib/grub/i386-efi/xnu_uuid.module
+usr/lib/grub/i386-efi/xzio.mod
+usr/lib/grub/i386-efi/xzio.module
+usr/lib/grub/i386-efi/zfs.mod
+usr/lib/grub/i386-efi/zfs.module
+usr/lib/grub/i386-efi/zfscrypt.mod
+usr/lib/grub/i386-efi/zfscrypt.module
+usr/lib/grub/i386-efi/zfsinfo.mod
+usr/lib/grub/i386-efi/zfsinfo.module
+>>>>>>> Enhance the flash image to support EFI
 usr/lib/grub/i386-pc
 #usr/lib/grub/i386-pc/acpi.mod
 #usr/lib/grub/i386-pc/acpi.module
@@ -598,7 +1026,7 @@ usr/sbin/grub-probe
 usr/sbin/grub-reboot
 usr/sbin/grub-set-default
 usr/sbin/grub-sparc64-setup
-usr/share/grub
+#usr/share/grub
 usr/share/grub/grub-mkconfig_lib
 #usr/share/info/grub-dev.info
 #usr/share/info/grub.info
diff --git a/lfs/flash-images b/lfs/flash-images
index f2ac6a34a1..cbd928faa9 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -29,8 +29,15 @@ VER = ipfire
 THISAPP    = flash-image
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "i586"
+	EFI = 1
+endif
+
 DEVICE     = $(shell losetup -f)
 PART_BOOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
+ifeq "$(EFI)" "1"
+  PART_EFI = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p2
+endif
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
 IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
@@ -70,6 +77,15 @@ else
  PART_TYPE = L
 endif
 
+GRUB_CFGS = /boot/grub/grub.cfg
+
+ifeq "$(EFI)" "1"
+ S_EFI = 204800
+ GRUB_CFGS += /boot/efi/EFI/ipfire/grub-efi/grub.cfg
+else
+ S_EFI = 0
+endif
+
 # /boot:  128MB - OFFSET
 # /    : 1200 MB
 S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
@@ -77,6 +93,17 @@ S_ROOT := 2477600
 
 PADDING = 100 # MB
 
+ifeq "$(EFI)" "1"
+ SFDISK_EFI  = $(S_OFFSET),$(S_EFI),c,*\n
+ SFDISK      = $(SFDISK_BOOT)$(SFDISK_EFI)$(SFDISK_ROOT)
+else
+ SFDISK_SWAP = ,0,0\n
+ SFDISK      = $(SFDISK_BOOT)$(SFDISK_SWAP)$(SFDISK_ROOT)
+endif
+
+SFDISK_BOOT = $(shell echo $$(( $(S_OFFSET) + $(S_EFI) ))),$(S_BOOT),$(PART_TYPE)\n
+SFDISK_ROOT = $(shell echo $$(( $(S_OFFSET) + $(S_EFI) + $(S_BOOT) ))),$(S_ROOT),L\n
+
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Stop if $(MNThdd) is still mounted
 	mountpoint $(MNThdd) && exit 1 || exit 0
@@ -84,13 +111,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf $(IMG) $(MNThdd) && mkdir -p $(MNThdd)
 
 	# Allocate image on disk
-	dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_ROOT) ))
+	dd if=/dev/zero of=$(IMG) bs=512 count=$$(( $(S_OFFSET) + $(S_BOOT) + $(S_EFI) + $(S_ROOT) ))
 	losetup $(DEVICE) $(IMG)
 
 	# Write Partition table
-	echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
-		| sfdisk -uS $(DEVICE)
+	echo -e "$(SFDISK)" | sfdisk -uS $(DEVICE)
+
+	# Remove 2nd empty partition
+ifneq "$(EFI)" "1"
 	-echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE)
+endif
 
 	kpartx -v -a $(DEVICE)
 
@@ -99,6 +129,9 @@ ifeq "$(PART_TYPE)" "c"
 	mkfs.vfat $(PART_BOOT)
 else
 	mkfs.ext2 -F $(PART_BOOT)
+endif
+ifeq "$(EFI)" "1"
+	mkfs.vfat $(PART_EFI)
 endif
 	mkfs.ext4 -O ^has_journal,extent -F $(PART_ROOT)
 
@@ -113,6 +146,11 @@ endif
 	mkdir -pv $(MNThdd)/boot
 	mount $(PART_BOOT) $(MNThdd)/boot
 
+ifeq "$(EFI)" "1"
+	mkdir -pv $(MNThdd)/boot/efi
+	mount $(PART_EFI) $(MNThdd)/boot/efi
+endif
+
 	# Install Pandaboard MLO and uboot first
 ifeq "$(BUILD_ARCH)" "armv5tel"
 	cp -v /boot/MLO $(MNThdd)/boot/
@@ -143,6 +181,10 @@ endif
 	# Create /etc/fstab
 	printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_BOOT))" "/boot" \
 		"auto" "defaults" 1 2 >  $(MNThdd)/etc/fstab
+ifeq "$(EFI)" "1"
+	printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_EFI))" "/boot/efi" \
+		"auto" "defaults" 1 2 >> $(MNThdd)/etc/fstab
+endif
 	printf "$(FSTAB_FMT)" "$$(blkid -o value -s UUID $(PART_ROOT))" "/" \
 		"auto" "defaults" 1 1 >> $(MNThdd)/etc/fstab
 
@@ -160,11 +202,14 @@ ifeq "$(BOOTLOADER)" "grub"
 			$(MNThdd)/etc/grub.d/
 
 	# Create configuration
-	mkdir -pv $(MNThdd)/boot/grub
-	chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
+	for i in $(GRUB_CFGS); do \
+		mkdir -pv $$(dirname $(MNThdd)$(GRUB_CFG)); \
+		chroot $(MNThdd) grub-mkconfig -o $$i || exit 1; \
+	done
 
 	# Insert the UUID because grub-mkconfig often fails to
 	# detect that correctly
+	sed -i $(addprefix $(MNThdd),$(GRUB_CFGS)) \
 	sed -i $(MNThdd)/boot/grub/grub.cfg \
 		-e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g"
 
@@ -175,6 +220,12 @@ ifeq "$(BOOTLOADER)" "grub"
 	# restore orginal defaults
 	mv -f $(MNThdd)/etc/default/grub.backup $(MNThdd)/etc/default/grub
 	rm -f $(MNThdd)/etc/grub.d/11_linux_scon
+
+ifeq "$(EFI)" "1"
+	mkdir -pv $(MNThdd)/boot/efi/EFI/boot
+	cp -vf $(MNThdd)/boot/efi/EFI/ipfire/grub-efi/grub.efi \
+		$(MNThdd)/boot/efi/EFI/boot/bootia32.efi
+endif
 endif
 
 	# Set ramdisk mode to automatic
@@ -187,6 +238,9 @@ endif
 	umount $(MNThdd)/proc
 	umount $(MNThdd)/sys
 	umount $(MNThdd)/dev
+ifeq "$(EFI)" "1"
+	umount $(MNThdd)/boot/efi
+endif
 	umount $(MNThdd)/boot
 	umount $(MNThdd)
 
diff --git a/lfs/grub b/lfs/grub
index 5148296135..0a6a22517f 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -30,12 +30,23 @@ THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP_EFI= $(DIR_APP)-efi
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 
+EFI = 1
+
 CFLAGS     =
 CXXFLAGS   =
 
+CONFIGURE_ARGS = \
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--with-grubdir=grub \
+	--disable-grub-mount \
+	--disable-werror \
+	--program-transform-name=s,grub,grub,
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -76,25 +87,39 @@ $(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.02_disable_vga_fallback.patch
-
-	cd $(DIR_APP) && \
-		./configure \
-			--prefix=/usr \
-			--sysconfdir=/etc \
-			--with-platform=pc \
-			--with-grubdir=grub \
-			--program-transform-name=s,grub,grub, \
-			--disable-grub-mount \
-			--disable-werror
+	@rm -rf $(DIR_APP) $(DIR_APP_EFI) && 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
+
+ifeq "$(EFI)" "1"
+	cp -av $(DIR_APP) $(DIR_APP_EFI)
+	cd $(DIR_APP_EFI) && ./configure $(CONFIGURE_ARGS) --with-platform=efi
+	cd $(DIR_APP_EFI) && make $(MAKETUNING)
+
+	cd $(DIR_APP_EFI) && ./grub-mkimage \
+		-O i386-efi \
+		-p /EFI/ipfire/grub-efi \
+		-o grub.efi \
+		-d  grub-core part_msdos part_gpt fat ext2 xfs normal chain \
+			boot configfile linux jpeg minicmd loadbios png gzio loadenv \
+			reboot halt serial search font gfxmenu gfxterm echo video all_video \
+			usb minicmd
+endif
+
+	cd $(DIR_APP) && ./configure $(CONFIGURE_ARGS) --with-platform=pc
 	cd $(DIR_APP) && make $(MAKETUNING)
+
+ifeq "$(EFI)" "1"
+	cd $(DIR_APP_EFI) && make install
+
+	-mkdir -pv /boot/efi/EFI/ipfire/grub-efi
+	touch /boot/efi/EFI/ipfire/grub-efi/grub.cfg
+	install -m 755 $(DIR_APP_EFI)/grub.efi /boot/efi/EFI/ipfire/grub-efi/grub.efi
+endif
+
 	cd $(DIR_APP) && make install
 
 	-mkdir -pv /boot/grub
 	touch /boot/grub/grub.cfg
-	ln -svf ../boot/grub/grub.cfg /etc/grub2.cfg
 	install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
 
 	-mkdir -pv /etc/default
@@ -111,5 +136,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
 		$(DIR_DL)/unifont-7.0.03.pcf.gz
 
-	@rm -rf $(DIR_APP)
+	@rm -rf $(DIR_APP) $(DIR_APP_EFI)
 	@$(POSTBUILD)