shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

sd-boot: use structured initialization

Browse Source
This commit is contained in:
Lennart Poettering 2018-10-23 13:42:58 +02:00
parent b58c7351c0
commit aec1443aec
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/boot/efi/boot.c
View File

@ -1404,9 +1404,11 @@ static VOID config_load_defaults(Config *config, EFI_FILE *root_dir) {
UINTN sec; UINTN sec;
EFI_STATUS err; EFI_STATUS err;
config->editor = TRUE; *config = (Config) {
config->auto_entries = TRUE; .editor = TRUE,
config->auto_firmware = TRUE; .auto_entries = TRUE,
.auto_firmware = TRUE,
};
err = file_read(root_dir, L"\\loader\\loader.conf", 0, 0, &content, NULL); err = file_read(root_dir, L"\\loader\\loader.conf", 0, 0, &content, NULL);
if (!EFI_ERROR(err)) if (!EFI_ERROR(err))
@ -2137,7 +2139,6 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
loaded_image_path = DevicePathToStr(loaded_image->FilePath); loaded_image_path = DevicePathToStr(loaded_image->FilePath);
efivar_set(L"LoaderImageIdentifier", loaded_image_path, FALSE); efivar_set(L"LoaderImageIdentifier", loaded_image_path, FALSE);
ZeroMem(&config, sizeof(Config));
config_load_defaults(&config, root_dir); config_load_defaults(&config, root_dir);
/* scan /EFI/Linux/ directory */ /* scan /EFI/Linux/ directory */