use EFI/Boot/bootx64.efi instead of EFI/BOOT/BOOTX64.EFI

4 files changed, 11 insertions, 11 deletions

diff --git a/man/gummiboot.xml b/man/gummiboot.xml
index f173d9b..4b42ce3 100644
--- a/man/gummiboot.xml
+++ b/man/gummiboot.xml
@@ -73,14 +73,14 @@
                 <para><command>gummiboot update</command> updates all installed
                 versions of gummiboot, if the current version is newer than the
                 version installed in the EFI system partition. This also includes
-                the EFI default/fallback loader at /EFI/BOOT/BOOT*.EFI. An
+                the EFI default/fallback loader at /EFI/Boot/boot*.efi. An
                 gummiboot entry in the EFI boot variables is created, if there
                 is no current entry. A created entry will be added to the end of
                 the boot order list.</para>
 
                 <para><command>gummiboot install</command> installs gummiboot into
                 the EFI system partition. A copy of gummiboot will be stored as
-                the EFI default/fallback loader at /EFI/BOOT/BOOT*.EFI. An gummiboot
+                the EFI default/fallback loader at /EFI/Boot/boot*.efi. An gummiboot
                 entry in the EFI boot variables is created and added to the top
                 of the boot order list.</para>
 
diff --git a/src/efi/gummiboot.c b/src/efi/gummiboot.c
index 7e547de..f7e4d40 100644
--- a/src/efi/gummiboot.c
+++ b/src/efi/gummiboot.c
@@ -2209,7 +2209,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
         config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
                                      L"auto-efi-shell", 's', L"EFI Shell", L"\\shell" MACHINE_TYPE_NAME ".efi");
         config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
-                                     L"auto-efi-default", '\0', L"EFI Default Loader", L"\\EFI\\BOOT\\BOOT" MACHINE_TYPE_NAME ".EFI");
+                                     L"auto-efi-default", '\0', L"EFI Default Loader", L"\\EFI\\Boot\\boot" MACHINE_TYPE_NAME ".efi");
         config_entry_add_osx(&config);
         efivar_set(L"LoaderEntriesAuto", config.entries_auto, FALSE);
 
diff --git a/src/setup/setup.c b/src/setup/setup.c
index beb9ed6..6a4275a 100644
--- a/src/setup/setup.c
+++ b/src/setup/setup.c
@@ -389,7 +389,7 @@ static int status_binaries(const char *esp_path, uint8_t partition[16]) {
         else if (r < 0)
                 return r;
 
-        r = enumerate_binaries(esp_path, "EFI/BOOT", "BOOT");
+        r = enumerate_binaries(esp_path, "EFI/Boot", "boot");
         if (r == 0)
                 fprintf(stderr, "No default/fallback boot loader installed in ESP.\n");
         else if (r < 0)
@@ -723,7 +723,7 @@ static int create_dirs(const char *esp_path) {
         if (r < 0)
                 return r;
 
-        r = mkdir_one(esp_path, "EFI/BOOT");
+        r = mkdir_one(esp_path, "EFI/Boot");
         if (r < 0)
                 return r;
 
@@ -760,7 +760,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
                 int k;
 
                 /* Create the EFI default boot loader name (specified for removable devices) */
-                if (asprintf(&v, "%s/EFI/BOOT/%s", esp_path, name + 5) < 0) {
+                if (asprintf(&v, "%s/EFI/Boot/%s", esp_path, name + 5) < 0) {
                         fprintf(stderr, "Out of memory.\n");
                         r = -ENOMEM;
                         goto finish;
@@ -1046,7 +1046,7 @@ static int remove_boot_efi(const char *esp_path) {
         DIR *d = NULL;
         int r = 0, c = 0;
 
-        if (asprintf(&p, "%s/EFI/BOOT", esp_path) < 0) {
+        if (asprintf(&p, "%s/EFI/Boot", esp_path) < 0) {
                 fprintf(stderr, "Out of memory.\n");
                 return -ENOMEM;
         }
@@ -1075,7 +1075,7 @@ static int remove_boot_efi(const char *esp_path) {
                 if (n < 4 || strcasecmp(de->d_name + n - 4, ".EFI") != 0)
                         continue;
 
-                if (strncasecmp(de->d_name, "BOOT", 4) != 0)
+                if (strncasecmp(de->d_name, "Boot", 4) != 0)
                         continue;
 
                 free(q);
@@ -1172,7 +1172,7 @@ static int remove_binaries(const char *esp_path) {
         if (q < 0 && r == 0)
                 r = q;
 
-        q = rmdir_one(esp_path, "EFI/BOOT");
+        q = rmdir_one(esp_path, "EFI/Boot");
         if (q < 0 && r == 0)
                 r = q;
 
diff --git a/test/test-create-disk.sh b/test/test-create-disk.sh
index ed2c45c..c2c2881 100755
--- a/test/test-create-disk.sh
+++ b/test/test-create-disk.sh
@@ -12,8 +12,8 @@ mkdir -p mnt
 mount $LOOP mnt
 
 # install gummiboot
-mkdir -p mnt/EFI/BOOT
-cp gummibootx64.efi mnt/EFI/BOOT/BOOTX64.EFI
+mkdir -p mnt/EFI/Boot
+cp gummibootx64.efi mnt/EFI/Boot/bootx64.efi
 
 [ -e /boot/shellx64.efi ] && cp /boot/shellx64.efi mnt/