forked from AbleOS/ableos
Ready
This commit is contained in:
parent
2114b9a346
commit
65bb92e02b
|
@ -1,16 +1,6 @@
|
|||
[boot]
|
||||
system_processes = []
|
||||
user_processes = ["shell"]
|
||||
|
||||
[logging]
|
||||
enabled = true
|
||||
level = "Trace"
|
||||
log_to_serial = true
|
||||
log_to_vterm = false
|
||||
filter = ["ableos::ps2_mouse", "ableos::vterm"]
|
||||
|
||||
|
||||
[tests]
|
||||
run_tests = false
|
||||
run_demos = false
|
||||
run_shader_tests = false
|
||||
filter = ["ableos::ps2_mouse", "ableos::vterm", "ableos::devices::pci"]
|
||||
|
|
|
@ -19,9 +19,7 @@ pub enum LogLevel {
|
|||
|
||||
#[derive(Serialize, Debug, Deserialize)]
|
||||
pub struct KernelConfig {
|
||||
pub boot: BootConfig,
|
||||
pub logging: LoggingConfig,
|
||||
pub tests: TestsConfig,
|
||||
}
|
||||
|
||||
impl KernelConfig {
|
||||
|
@ -56,15 +54,3 @@ pub struct LoggingConfig {
|
|||
pub level: LogLevel,
|
||||
pub filter: Vec<String>,
|
||||
}
|
||||
#[derive(Serialize, Debug, Deserialize)]
|
||||
pub struct TestsConfig {
|
||||
pub run_tests: bool,
|
||||
pub run_demos: bool,
|
||||
pub run_shader_tests: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Debug, Deserialize)]
|
||||
pub struct BootConfig {
|
||||
pub system_processes: Vec<String>,
|
||||
pub user_processes: Vec<String>,
|
||||
}
|
||||
|
|
7
base/boot/kernel.toml
Normal file
7
base/boot/kernel.toml
Normal file
|
@ -0,0 +1,7 @@
|
|||
[logging]
|
||||
enabled = true
|
||||
level = "Trace"
|
||||
log_to_serial = true
|
||||
log_to_vterm = false
|
||||
filter = ["ableos::ps2_mouse", "ableos::vterm", "ableos::devices::pci"]
|
||||
|
|
@ -103,7 +103,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
|
||||
println!("{}", "Partitioning disk image".bold());
|
||||
let dbus_conn = zbus::blocking::Connection::system()?;
|
||||
|
||||
|
||||
// Setup loop device
|
||||
let disk_img = File::options().read(true).write(true).open("disk.img")?;
|
||||
let loopdev = udisks::manager::UDisks2ManagerProxyBlocking::new(&dbus_conn)?
|
||||
|
@ -136,7 +136,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||
"",
|
||||
"",
|
||||
Default::default(),
|
||||
"ext4",
|
||||
"ext2",
|
||||
[("take-ownership", true.into())].into_iter().collect(),
|
||||
)?;
|
||||
|
||||
|
|
Loading…
Reference in a new issue