From 706c17c74f68d86466bc8923c7fa0ce55731ebd4 Mon Sep 17 00:00:00 2001 From: Able Date: Sat, 5 Feb 2022 00:26:32 -0600 Subject: [PATCH] root_fs --- ableos/src/kmain.rs | 13 ++----------- root_fs/LAYOUT.md | 0 root_fs/init_proc.toml | 6 ++++++ 3 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 root_fs/LAYOUT.md create mode 100644 root_fs/init_proc.toml diff --git a/ableos/src/kmain.rs b/ableos/src/kmain.rs index dca440a..aece4fd 100644 --- a/ableos/src/kmain.rs +++ b/ableos/src/kmain.rs @@ -41,11 +41,7 @@ pub fn kernel_main() -> ! { log::set_max_level(BOOT_CONF.log_level()); // init::init(); - if (|| true)() || (|| false)() { - () - } else { - ((), ()); - } + log_version_data(); /* @@ -141,10 +137,7 @@ use uefi::{ }; use uefi::{proto::console::gop::FrameBuffer, ResultExt}; -use crate::{ - vterm::{self, Vterm}, - GraphicsReturn, ScreenBuffer, -}; +use crate::{vterm::Vterm, GraphicsReturn, ScreenBuffer}; #[entry] fn main(_handle: Handle, mut system_table: SystemTable) -> Status { @@ -161,8 +154,6 @@ fn main(_handle: Handle, mut system_table: SystemTable) -> Status { info!("UEFI {}.{}", major, minor); } - log_version_data(); - info!("Running graphics output protocol test"); if let Ok(gop) = system_table .boot_services() diff --git a/root_fs/LAYOUT.md b/root_fs/LAYOUT.md new file mode 100644 index 0000000..e69de29 diff --git a/root_fs/init_proc.toml b/root_fs/init_proc.toml new file mode 100644 index 0000000..99afe33 --- /dev/null +++ b/root_fs/init_proc.toml @@ -0,0 +1,6 @@ +# Run all processes here at boot +# This is a sample process +[helloworld] # This is the name of the process +binary = "bin://hello" # This is the binary to run +spawn_order = "1" # Spawn order of the processes (lower is earlier) +arguments = ["--name", "Hello World"] # Arguments to pass to the binary