From 754c0ac1098303f80e1390c4498f8386d3f3e57f Mon Sep 17 00:00:00 2001
From: Khue Doan <khuedoan98@gmail.com>
Date: Sun, 13 Jun 2021 03:27:15 +0700
Subject: [PATCH] Use the same grubx64.efi path as the image

---
 metal/roles/pxe-boot/tasks/server.yml             | 3 +--
 metal/roles/pxe-boot/templates/docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/metal/roles/pxe-boot/tasks/server.yml b/metal/roles/pxe-boot/tasks/server.yml
index 329e20f7..be6cd419 100644
--- a/metal/roles/pxe-boot/tasks/server.yml
+++ b/metal/roles/pxe-boot/tasks/server.yml
@@ -11,7 +11,6 @@
     - "{{ role_path }}/build"
     - "{{ role_path }}/files/images"
     - "{{ role_path }}/build/mnt"
-    - "{{ role_path }}/build/mnt/EFI/BOOT"
 
 - name: Download ISO
   get_url:
@@ -29,7 +28,7 @@
 - name: Extract bootloader
   iso_extract:
     image: "{{ role_path }}/build/mnt/images/efiboot.img"
-    dest: "{{ role_path }}/build/mnt/EFI/BOOT"
+    dest: "{{ role_path }}/build/mnt/EFI/fedora"
     files:
       - EFI/fedora/grubx64.efi
 
diff --git a/metal/roles/pxe-boot/templates/docker-compose.yml b/metal/roles/pxe-boot/templates/docker-compose.yml
index b9848b64..a292129b 100644
--- a/metal/roles/pxe-boot/templates/docker-compose.yml
+++ b/metal/roles/pxe-boot/templates/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     build: ./tftp
     network_mode: host
     volumes:
-      - ./mnt/EFI/BOOT/grubx64.efi:/var/lib/tftpboot/grubx64.efi
+      - ./mnt/EFI/fedora/grubx64.efi:/var/lib/tftpboot/grubx64.efi
       - ./mnt/images/ignition.img:/var/lib/tftpboot/ignition.img
       - ./mnt/images/pxeboot/initrd.img:/var/lib/tftpboot/initrd.img
       - ./mnt/images/pxeboot/vmlinuz:/var/lib/tftpboot/vmlinuz