Skip to content

Add support for a configuration file #326

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 10 commits into from
Jan 27, 2023
Merged

Add support for a configuration file #326

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5283233
Add support for a configuration file
asensio-project Jan 14, 2023
3ab261b
Fix an error
asensio-project Jan 14, 2023
9351604
Fix api test
asensio-project Jan 14, 2023
a7a1958
Make it fault tolerant
asensio-project Jan 15, 2023
bc7ccf8
Add a test
asensio-project Jan 15, 2023
a164de5
Apply suggestions
asensio-project Jan 21, 2023
bb461c3
Apply suggestions (Second Part)
asensio-project Jan 26, 2023
b1fdfb3
Merge branch 'main' into add-a-config-file
asensio-project Jan 26, 2023
a6ee0f4
Fix an import
asensio-project Jan 26, 2023
32277c4
Improve Default trait use in bootloader boot config
asensio-project Jan 27, 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
133 changes: 125 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ fatfs = "0.3.4"
tempfile = "3.3.0"
mbrman = { version = "0.5.1", optional = true }
gpt = { version = "3.0.0", optional = true }
bootloader-x86_64-common = { version = "0.11.0", path = "common" }
serde_json = "1.0.91"

[dev-dependencies]
bootloader_test_runner = { path = "tests/runner" }
Expand All @@ -57,6 +59,7 @@ test_kernel_higher_half = { path = "tests/test_kernels/higher_half", artifact =
test_kernel_map_phys_mem = { path = "tests/test_kernels/map_phys_mem", artifact = "bin", target = "x86_64-unknown-none" }
test_kernel_pie = { path = "tests/test_kernels/pie", artifact = "bin", target = "x86_64-unknown-none" }
test_kernel_ramdisk = { path = "tests/test_kernels/ramdisk", artifact = "bin", target = "x86_64-unknown-none" }
test_kernel_config_file = { path = "tests/test_kernels/config_file", artifact = "bin", target = "x86_64-unknown-none" }

[profile.dev]
panic = "abort"
Expand Down
3 changes: 0 additions & 3 deletions api/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ fn main() {
(97, 9),
(106, 9),
(115, 9),
(124, 1),
(125, 1),
(126, 1),
];

let mut code = String::new();
Expand Down
Loading