From 24b58dc92d126280fb4bf1f97063a4a5966a2102 Mon Sep 17 00:00:00 2001
From: Marcos Tischer Vallim <tischer@gmail.com>
Date: Sun, 30 Jun 2019 13:54:56 -0300
Subject: [PATCH 1/3] Update README.md

---
 README.md | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 72cf01c..e8e3519 100644
--- a/README.md
+++ b/README.md
@@ -357,9 +357,18 @@ sudo umount $HOME/live-ubuntu-from-scratch/chroot/run
    sudo cp chroot/boot/initrd.img-**-**-generic image/casper/initrd
    ```
 
-3. Copy memtest binary
+3. Copy memtest86+ binary (BIOS)
    ```
-   sudo cp chroot/boot/memtest86+.bin image/install/memtest
+   sudo cp chroot/boot/memtest86+.bin image/install/memtest86+
+   ```
+   
+4. Extract memtest86 binary (UEFI)
+   ```
+   wget --progress=dot https://www.memtest86.com/downloads/memtest86-usb.zip -O image/install/memtest86-usb.zip
+   
+   unzip -p image/install/memtest86-usb.zip memtest86-usb.img > image/install/memtest86
+   
+   rm image/install/memtest86-usb.zip
    ```
 
 ## Grub configuration
@@ -395,8 +404,13 @@ sudo umount $HOME/live-ubuntu-from-scratch/chroot/run
          initrd /casper/initrd
       }
 
-      menuentry "Test memory" {
-         linux16 /install/memtest
+      menuentry "Test memory Memtest86+ (BIOS)" {
+         linux16 /install/memtest86+
+      }
+      
+      menuentry "Test memory Memtest86 (UEFI, long load time)" {
+         loopback loop /install/memtest86
+         chainloader (loop,1)/EFI/BOOT/BOOTX64.efi
       }
       EOF
       ```
@@ -558,4 +572,4 @@ sudo umount $HOME/live-ubuntu-from-scratch/chroot/run
 It is simple and easy, using "dd"
 ```
 sudo dd if=ubuntu-from-scratch.iso of=<device> bs=4M
-```
\ No newline at end of file
+```

From 315ce2edf89b2bd0c48ea648263d5d5fae793186 Mon Sep 17 00:00:00 2001
From: Marcos Tischer Vallim <tischer@gmail.com>
Date: Sun, 30 Jun 2019 14:41:35 -0300
Subject: [PATCH 2/3] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8e3519..2130ce8 100644
--- a/README.md
+++ b/README.md
@@ -409,8 +409,11 @@ sudo umount $HOME/live-ubuntu-from-scratch/chroot/run
       }
       
       menuentry "Test memory Memtest86 (UEFI, long load time)" {
+         insmod part_gpt
+         insmod search_fs_uuid
+         insmod chain
          loopback loop /install/memtest86
-         chainloader (loop,1)/EFI/BOOT/BOOTX64.efi
+         chainloader (loop,1)/efi/boot/BOOTX64.efi
       }
       EOF
       ```

From 5f6af87b657a975b10ea5f985813631003a202c2 Mon Sep 17 00:00:00 2001
From: Marcos Tischer Vallim <tischer@gmail.com>
Date: Sun, 30 Jun 2019 14:48:35 -0300
Subject: [PATCH 3/3] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2130ce8..95fb928 100644
--- a/README.md
+++ b/README.md
@@ -413,7 +413,7 @@ sudo umount $HOME/live-ubuntu-from-scratch/chroot/run
          insmod search_fs_uuid
          insmod chain
          loopback loop /install/memtest86
-         chainloader (loop,1)/efi/boot/BOOTX64.efi
+         chainloader (loop,gpt1)/efi/boot/BOOTX64.efi
       }
       EOF
       ```