Skip to content
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.

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

Fix loading of boot configuration #342

Merged
merged 5 commits into from
Jan 30, 2023
Merged

Fix loading of boot configuration #342

merged 5 commits into from
Jan 30, 2023

Conversation

phil-opp
Copy link
Member

Fixes various issues in the boot config file loading introduced in #326:

  • Test that boot config is actually loaded (through a sentinel value)
    • before, we only verified that no panic occurs, but we didn't check the values
    • the new sentinel value is passed through the boot info as a hidden field
  • Use correct file name when loading boot config file
  • Include boot config when using TFTP booting
    • looks like we forgot to update this part
  • Fix: Load kernel first, then use same boot mode for config file
    • before, we always tried to load the config file from disk
  • Fix: Consider config file when initializing frame allocator
    • We still considered the ramdisk file as the last used frame when initializing the frame allocator, so we overwrote the config file.

We previously tried to always load the config file from disk.
We still considered the ramdisk file as the last used frame when initializing the frame allocator, so we overwrote the config file. This commit fixes this by setting the `last_used_addr` correctly when creating the `BiosInfo`.
@phil-opp phil-opp merged commit ca98936 into main Jan 30, 2023
@phil-opp phil-opp deleted the fix-config branch January 30, 2023 08:05
@phil-opp phil-opp mentioned this pull request Mar 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant