basic/efivars: replace dynanamic creation of efivar names with static strings

[thirdparty/systemd.git] / src / shared / bootspec.c

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 354eb6828d75f04f43c652b4a5fc81089c92a186..dc334cf19664b7efb764596e484ff74897c6ba6e 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -677,14 +677,14 @@ int boot_entries_load_config(
                 return log_error_errno(r, "Failed to uniquify boot entries: %m");
 
         if (is_efi_boot()) {
-                r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderEntryOneShot", &config->entry_oneshot);
+                r = efi_get_variable_string(EFI_LOADER_VARIABLE(LoaderEntryOneShot), &config->entry_oneshot);
                 if (r < 0 && !IN_SET(r, -ENOENT, -ENODATA)) {
                         log_warning_errno(r, "Failed to read EFI variable \"LoaderEntryOneShot\": %m");
                         if (r == -ENOMEM)
                                 return r;
                 }
 
-                r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderEntryDefault", &config->entry_default);
+                r = efi_get_variable_string(EFI_LOADER_VARIABLE(LoaderEntryDefault), &config->entry_default);
                 if (r < 0 && !IN_SET(r, -ENOENT, -ENODATA)) {
                         log_warning_errno(r, "Failed to read EFI variable \"LoaderEntryDefault\": %m");
                         if (r == -ENOMEM)
@@ -776,7 +776,7 @@ int boot_entries_augment_from_loader(
                                 break;
                         }
 
-                p = efi_variable_path(EFI_VENDOR_LOADER, "LoaderEntries");
+                p = strdup(EFIVAR_PATH(EFI_LOADER_VARIABLE(LoaderEntries)));
                 if (!p)
                         return log_oom();