enum loader_type type;
CHAR16 *loader;
CHAR16 *options;
- CHAR16 *splash;
CHAR16 key;
EFI_STATUS (*call)(VOID);
BOOLEAN no_autoselect;
UINTN timeout_sec_config;
INTN timeout_sec_efivar;
CHAR16 *entry_default_pattern;
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL *background;
CHAR16 *entry_oneshot;
CHAR16 *options_edit;
- CHAR16 *entries_auto;
+ BOOLEAN no_editor;
} Config;
static VOID cursor_left(UINTN *cursor, UINTN *first)
return -1;
}
-static VOID print_status(Config *config, EFI_FILE *root_dir, CHAR16 *loaded_image_path) {
+static VOID print_status(Config *config, CHAR16 *loaded_image_path) {
UINT64 key;
UINTN i;
CHAR16 *s;
UINTN x;
UINTN y;
UINTN size;
- EFI_STATUS err;
- UINTN color = 0;
- const EFI_GRAPHICS_OUTPUT_BLT_PIXEL *pixel = config->background;
uefi_call_wrapper(ST->ConOut->SetAttribute, 2, ST->ConOut, EFI_LIGHTGRAY|EFI_BACKGROUND_BLACK);
uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut);
Print(L"console size: %d x %d\n", x, y);
if (efivar_get_raw(&global_guid, L"SecureBoot", &b, &size) == EFI_SUCCESS) {
- Print(L"SecureBoot: %s\n", *b > 0 ? L"enabled" : L"disabled");
+ Print(L"SecureBoot: %s\n", yes_no(*b > 0));
FreePool(b);
}
Print(L"timeout (config): %d\n", config->timeout_sec_config);
if (config->entry_default_pattern)
Print(L"default pattern: '%s'\n", config->entry_default_pattern);
- if (config->background)
- Print(L"background '#%02x%02x%02x'\n",
- config->background->Red, config->background->Green, config->background->Blue);
+ Print(L"editor: %s\n", yes_no(!config->no_editor));
Print(L"\n");
Print(L"config entry count: %d\n", config->entry_count);
Print(L"LoaderConfigTimeout: %d\n", i);
if (config->entry_oneshot)
Print(L"LoaderEntryOneShot: %s\n", config->entry_oneshot);
- if (efivar_get(L"LoaderDeviceIdentifier", &s) == EFI_SUCCESS) {
- Print(L"LoaderDeviceIdentifier: %s\n", s);
- FreePool(s);
- }
if (efivar_get(L"LoaderDevicePartUUID", &s) == EFI_SUCCESS) {
Print(L"LoaderDevicePartUUID: %s\n", s);
FreePool(s);
break;
entry = config->entries[i];
-
- if (entry->splash) {
- UINT8 *content = NULL;
- INTN len;
-
- len = file_read(root_dir, entry->splash, 0, 0, &content);
- if (len > 0) {
- for (;;) {
- static const EFI_GRAPHICS_OUTPUT_BLT_PIXEL colors[] = {
- { .Red = 0xff, .Green = 0xff, .Blue = 0xff },
- { .Red = 0xc0, .Green = 0xc0, .Blue = 0xc0 },
- { .Red = 0xff, .Green = 0, .Blue = 0 },
- { .Red = 0, .Green = 0xff, .Blue = 0 },
- { .Red = 0, .Green = 0, .Blue = 0xff },
- { .Red = 0, .Green = 0, .Blue = 0 },
- };
-
- err = graphics_splash(content, len, pixel);
- if (EFI_ERROR(err))
- break;
-
- /* 'b' rotates through background colors */
- console_key_read(&key, TRUE);
- if (key != KEYPRESS(0, 0, 'b'))
- break;
- pixel = &colors[color++];
- if (color == ELEMENTSOF(colors))
- color = 0;
- }
- }
-
- FreePool(content);
- graphics_mode(FALSE);
- uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut);
- }
-
Print(L"config entry: %d/%d\n", i+1, config->entry_count);
if (entry->file)
Print(L"file '%s'\n", entry->file);
Print(L"loader '%s'\n", entry->loader);
if (entry->options)
Print(L"options '%s'\n", entry->options);
- if (entry->splash)
- Print(L"splash '%s'\n", entry->splash);
- Print(L"auto-select %s\n", entry->no_autoselect ? L"no" : L"yes");
+ Print(L"auto-select %s\n", yes_no(!entry->no_autoselect));
if (entry->call)
Print(L"internal call yes\n");
uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut);
}
-static BOOLEAN menu_run(Config *config, ConfigEntry **chosen_entry, EFI_FILE *root_dir, CHAR16 *loaded_image_path) {
+static BOOLEAN menu_run(Config *config, ConfigEntry **chosen_entry, CHAR16 *loaded_image_path) {
EFI_STATUS err;
UINTN visible_max;
UINTN idx_highlight;
case KEYPRESS(0, 0, 'e'):
/* only the options of configured entries can be edited */
- if (config->entries[idx_highlight]->type == LOADER_UNDEFINED)
+ if (config->no_editor || config->entries[idx_highlight]->type == LOADER_UNDEFINED)
break;
uefi_call_wrapper(ST->ConOut->SetAttribute, 2, ST->ConOut, EFI_LIGHTGRAY|EFI_BACKGROUND_BLACK);
uefi_call_wrapper(ST->ConOut->SetCursorPosition, 3, ST->ConOut, 0, y_max-1);
break;
case KEYPRESS(0, 0, 'P'):
- print_status(config, root_dir, loaded_image_path);
+ print_status(config, loaded_image_path);
refresh = TRUE;
break;
idx_last = idx_highlight;
idx_first = 1 + idx_highlight - visible_max;
refresh = TRUE;
- }
- if (idx_highlight < idx_first) {
+ } else if (idx_highlight < idx_first) {
idx_first = idx_highlight;
idx_last = idx_highlight + visible_max-1;
refresh = TRUE;
}
- idx_last = idx_first + visible_max-1;
-
if (!refresh && idx_highlight != idx_highlight_prev)
highlight = TRUE;
}
StrLwr(config->entry_default_pattern);
continue;
}
+
+ if (strcmpa((CHAR8 *)"editor", key) == 0) {
+ BOOLEAN on;
+
+ if (EFI_ERROR(parse_boolean(value, &on)))
+ continue;
+ config->no_editor = !on;
+ }
}
}
FreePool(new);
continue;
}
-
- if (strcmpa((CHAR8 *)"splash", key) == 0) {
- FreePool(entry->splash);
- entry->splash = stra_to_path(value);
- continue;
- }
}
if (entry->type == LOADER_UNDEFINED) {
}
FreePool(initrd);
- if (entry->machine_id) {
- CHAR16 *var;
-
- /* append additional options from EFI variables for this machine-id */
- var = PoolPrint(L"LoaderEntryOptions-%s", entry->machine_id);
- if (var) {
- CHAR16 *s;
-
- if (efivar_get(var, &s) == EFI_SUCCESS) {
- if (entry->options) {
- CHAR16 *s2;
-
- s2 = PoolPrint(L"%s %s", entry->options, s);
- FreePool(entry->options);
- entry->options = s2;
- } else
- entry->options = s;
- }
- FreePool(var);
- }
-
- var = PoolPrint(L"LoaderEntryOptionsOneShot-%s", entry->machine_id);
- if (var) {
- CHAR16 *s;
-
- if (efivar_get(var, &s) == EFI_SUCCESS) {
- if (entry->options) {
- CHAR16 *s2;
-
- s2 = PoolPrint(L"%s %s", entry->options, s);
- FreePool(entry->options);
- entry->options = s2;
- } else
- entry->options = s;
- efivar_set(var, NULL, TRUE);
- }
- FreePool(var);
- }
- }
-
entry->device = device;
entry->file = StrDuplicate(file);
len = StrLen(entry->file);
continue;
if (f->Attribute & EFI_FILE_DIRECTORY)
continue;
+
len = StrLen(f->FileName);
if (len < 6)
continue;
if (StriCmp(f->FileName + len - 5, L".conf") != 0)
continue;
+ if (StrnCmp(f->FileName, L"auto-", 5) == 0)
+ continue;
len = file_read(entries_dir, f->FileName, 0, 0, &content);
if (len > 0)
/* do not boot right away into auto-detected entries */
entry->no_autoselect = TRUE;
- /* export identifiers of automatically added entries */
- if (config->entries_auto) {
- CHAR16 *s;
-
- s = PoolPrint(L"%s %s", config->entries_auto, file);
- FreePool(config->entries_auto);
- config->entries_auto = s;
- } else
- config->entries_auto = StrDuplicate(file);
-
return TRUE;
}
FreePool(config->entry_default_pattern);
FreePool(config->options_edit);
FreePool(config->entry_oneshot);
- FreePool(config->entries_auto);
- FreePool(config->background);
}
EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
/* export the device path this image is started from */
device_path = DevicePathFromHandle(loaded_image->DeviceHandle);
if (device_path) {
- CHAR16 *str;
EFI_DEVICE_PATH *path, *paths;
- str = DevicePathToStr(device_path);
- efivar_set(L"LoaderDeviceIdentifier", str, FALSE);
- FreePool(str);
-
paths = UnpackDevicePath(device_path);
for (path = paths; !IsDevicePathEnd(path); path = NextDevicePathNode(path)) {
HARDDRIVE_DEVICE_PATH *drive;
ZeroMem(&config, sizeof(Config));
config_load(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path);
- if (!config.background) {
- config.background = AllocateZeroPool(sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
- if (StriCmp(L"Apple", ST->FirmwareVendor) == 0) {
- config.background->Red = 0xc0;
- config.background->Green = 0xc0;
- config.background->Blue = 0xc0;
- }
- }
-
/* if we find some well-known loaders, add them to the end of the list */
config_entry_add_linux(&config, loaded_image, root_dir);
config_entry_add_loader_auto(&config, loaded_image->DeviceHandle, root_dir, loaded_image_path,
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" EFI_MACHINE_TYPE_NAME ".efi");
config_entry_add_osx(&config);
- efivar_set(L"LoaderEntriesAuto", config.entries_auto, FALSE);
if (efivar_get_raw(&global_guid, L"OsIndicationsSupported", &b, &size) == EFI_SUCCESS) {
UINT64 osind = (UINT64)*b;
if (menu) {
efivar_set_time_usec(L"LoaderTimeMenuUSec", 0);
uefi_call_wrapper(BS->SetWatchdogTimer, 4, 0, 0x10000, 0, NULL);
- if (!menu_run(&config, &entry, root_dir, loaded_image_path))
+ if (!menu_run(&config, &entry, loaded_image_path))
break;
/* run special entry like "reboot" */
entry->call();
continue;
}
- } else if (entry->splash) {
- UINT8 *content = NULL;
- INTN len;
-
- len = file_read(root_dir, entry->splash, 0, 0, &content);
- if (len > 0)
- graphics_splash(content, len, config.background);
-
- FreePool(content);
}
/* export the selected boot entry to the system */
uefi_call_wrapper(BS->SetWatchdogTimer, 4, 5 * 60, 0x10000, 0, NULL);
err = image_start(image, &config, entry);
if (EFI_ERROR(err)) {
+ graphics_mode(FALSE);
Print(L"\nFailed to execute %s (%s): %r\n", entry->title, entry->loader, err);
uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
goto out;
~ianmdlvl / elogind.git / blobdiff