misc: Fix potentially misleading strings

This commit is contained in:
mintsuki 2021-06-30 18:44:31 +02:00
parent f8b5b145b5
commit 2f08116acb
6 changed files with 10 additions and 10 deletions

View File

@ -406,7 +406,7 @@ refresh:
int max_entries = print_tree(0, 0, selected_entry, menu_tree,
&selected_menu_entry);
print("\nArrows to choose, enter to boot, 'e' to edit selected entry.");
print("\nArrows to select, enter to boot, 'e' to edit selected entry.");
if (selected_menu_entry->sub != NULL)
skip_timeout = true;

View File

@ -117,7 +117,7 @@ void chainload(char *config) {
struct file_handle *image = ext_mem_alloc(sizeof(struct file_handle));
if (!uri_open(image, image_path))
panic("chainload: Could not open image");
panic("chainload: Failed to open image with path `%s`. Is the path correct?", image_path);
void *ptr = freadall(image, MEMMAP_RESERVED);
size_t image_size = image->size;

View File

@ -353,7 +353,7 @@ void linux_load(char *config, char *cmdline) {
panic("linux: KERNEL_PATH not specified");
if (!uri_open(kernel, kernel_path))
panic("linux: Could not open kernel resource");
panic("linux: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
uint32_t signature;
fread(kernel, &signature, 0x202, sizeof(uint32_t));
@ -443,7 +443,7 @@ void linux_load(char *config, char *cmdline) {
struct file_handle module;
if (!uri_open(&module, module_path))
panic("linux: Could not open `%s`", module_path);
panic("linux: Failed to open module with path `%s`. Is the path correct?", module_path);
size_of_all_modules += module.size;
}

View File

@ -28,7 +28,7 @@ void multiboot1_load(char *config, char *cmdline) {
print("multiboot1: Loading kernel `%s`...\n", kernel_path);
if (!uri_open(kernel_file, kernel_path))
panic("multiboot1: Could not open kernel resource");
panic("multiboot1: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
uint8_t *kernel = freadall(kernel_file, MEMMAP_USABLE);
@ -98,7 +98,7 @@ void multiboot1_load(char *config, char *cmdline) {
struct file_handle f;
if (!uri_open(&f, module_path))
panic("multiboot1: Requested module with path \"%s\" not found!", module_path);
panic("multiboot1: Failed to open module with path `%s`. Is the path correct?", module_path);
char *cmdline = config_get_value(config, i, "MODULE_STRING");

View File

@ -46,7 +46,7 @@ void stivale_load(char *config, char *cmdline) {
print("stivale: Loading kernel `%s`...\n", kernel_path);
if (!uri_open(kernel_file, kernel_path))
panic("stivale: Could not open kernel resource");
panic("stivale: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
struct stivale_header stivale_hdr;
@ -153,7 +153,7 @@ void stivale_load(char *config, char *cmdline) {
struct file_handle f;
if (!uri_open(&f, module_path))
panic("stivale: Requested module with path \"%s\" not found!", module_path);
panic("stivale: Failed to open module with path `%s`. Is the path correct?", module_path);
m->begin = REPORTED_ADDR((uint64_t)(size_t)freadall(&f, STIVALE_MMAP_KERNEL_AND_MODULES));
m->end = m->begin + f.size;

View File

@ -68,7 +68,7 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
print("stivale2: Loading kernel `%s`...\n", kernel_path);
if (!uri_open(kernel_file, kernel_path))
panic("stivale2: Could not open kernel resource");
panic("stivale2: Failed to open kernel with path `%s`. Is the path correct?", kernel_path);
struct stivale2_header stivale2_hdr;
@ -228,7 +228,7 @@ void stivale2_load(char *config, char *cmdline, bool pxe, void *efi_system_table
struct file_handle f;
if (!uri_open(&f, module_path))
panic("stivale2: Requested module with path \"%s\" not found!", module_path);
panic("stivale2: Failed to open module with path `%s`. Is the path correct?", module_path);
m->begin = REPORTED_ADDR((uint64_t)(size_t)freadall(&f, STIVALE2_MMAP_KERNEL_AND_MODULES));
m->end = m->begin + f.size;