diff --git a/ableos/assets/kernel.toml b/ableos/assets/kernel.toml index efcb00c04..81331d0cc 100644 --- a/ableos/assets/kernel.toml +++ b/ableos/assets/kernel.toml @@ -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"] diff --git a/ableos/src/boot_conf.rs b/ableos/src/boot_conf.rs index f3248c2a2..d2ec535c1 100644 --- a/ableos/src/boot_conf.rs +++ b/ableos/src/boot_conf.rs @@ -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, } -#[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, - pub user_processes: Vec, -} diff --git a/base/boot/kernel.toml b/base/boot/kernel.toml new file mode 100644 index 000000000..c375fccf8 --- /dev/null +++ b/base/boot/kernel.toml @@ -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"] + diff --git a/repbuild/src/main.rs b/repbuild/src/main.rs index b85004e93..77660bed7 100644 --- a/repbuild/src/main.rs +++ b/repbuild/src/main.rs @@ -103,7 +103,7 @@ fn main() -> Result<(), Box> { 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> { "", "", Default::default(), - "ext4", + "ext2", [("take-ownership", true.into())].into_iter().collect(), )?;