From e99afaba418284c0a270eceda42e09edd2e67336 Mon Sep 17 00:00:00 2001 From: Rafal Kupiec Date: Sat, 23 Dec 2023 23:11:15 +0100 Subject: [PATCH] Do not hardcode path to config file, and move it to the right directory --- bootdata/xtldr/CMakeLists.txt | 2 +- sdk/xtdk/bltypes.h | 6 +++--- xtldr2/config.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootdata/xtldr/CMakeLists.txt b/bootdata/xtldr/CMakeLists.txt index 3bf097a..9dcfcfb 100644 --- a/bootdata/xtldr/CMakeLists.txt +++ b/bootdata/xtldr/CMakeLists.txt @@ -1 +1 @@ -set_install_file(xtldr.ini efi/boot) +set_install_file(xtldr.ini efi/boot/xtldr) diff --git a/sdk/xtdk/bltypes.h b/sdk/xtdk/bltypes.h index 65f47a2..3452655 100644 --- a/sdk/xtdk/bltypes.h +++ b/sdk/xtdk/bltypes.h @@ -15,9 +15,9 @@ /* XTLDR directories */ -#define XTBL_LOADER_DIRECTORY L"\\EFI\\BOOT\\XTLDR\\" -#define XTBL_MODULES_DIRECTORY L"\\EFI\\BOOT\\XTLDR\\MODULES\\" -#define XTBL_THEMES_DIRECTORY L"\\EFI\\BOOT\\XTLDR\\THEMES\\" +#define XTBL_LOADER_DIRECTORY_PATH L"\\EFI\\BOOT\\XTLDR\\" +#define XTBL_MODULES_DIRECTORY_PATH L"\\EFI\\BOOT\\XTLDR\\MODULES\\" +#define XTBL_THEMES_DIRECTORY_PATH L"\\EFI\\BOOT\\XTLDR\\THEMES\\" /* EFI XT boot devices */ #define XTBL_BOOT_DEVICE_UNKNOWN 0x00 diff --git a/xtldr2/config.c b/xtldr2/config.c index b03c91a..65f74fc 100644 --- a/xtldr2/config.c +++ b/xtldr2/config.c @@ -121,7 +121,7 @@ BlpLoadConfiguration() RtlInitializeListHead(&BlpConfigSections); /* Read data from configuration file */ - Status = BlpReadConfigFile(L"\\EFI\\BOOT\\", L"XTLDR.INI", &ConfigData); + Status = BlpReadConfigFile(XTBL_LOADER_DIRECTORY_PATH, L"XTLDR.INI", &ConfigData); if(Status != STATUS_EFI_SUCCESS) { /* Failed to load configuration */