Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix loading of boot configuration #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 30, 2023
Merged

Fix loading of boot configuration #342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f5fdf0
Test that boot config is actually loaded (through a sentinel value)
phil-opp Jan 30, 2023
510a44b
Use correct file name when loading boot config file
phil-opp Jan 30, 2023
c87d041
Include boot config when using TFTP booting
phil-opp Jan 30, 2023
38aa266
Fix: Load kernel first, then use same boot mode for config file
phil-opp Jan 30, 2023
f03065e
Fix: Consider config file when initializing frame allocator
phil-opp Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use correct file name when loading boot config file
  • Loading branch information
@phil-opp
phil-opp committed Jan 30, 2023
commit 510a44bc357b6443a820e4ef4fbc41ee3b098c4c
2 changes: 1 addition & 1 deletion 2 bios/stage-2/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ fn start(disk_number: u16, partition_table_start: *const u8) -> ! {
}
let config_file_start = ramdisk_start.wrapping_add(ramdisk_len.try_into().unwrap());
let config_file_len = try_load_file(
"config.json",
"boot.json",
config_file_start,
&mut fs,
&mut disk,
Expand Down
2 changes: 1 addition & 1 deletion 2 uefi/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ fn load_config_file(
st: &mut SystemTable<Boot>,
boot_mode: BootMode,
) -> Option<&'static mut [u8]> {
load_file_from_boot_method(image, st, "config.json\0", boot_mode)
load_file_from_boot_method(image, st, "boot.json\0", boot_mode)
}

fn load_kernel(
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.