From 65bb92e02b6a5f6790b7912f647f53b1b33adb39 Mon Sep 17 00:00:00 2001
From: Able <abl3theabove@gmail.com>
Date: Thu, 24 Nov 2022 03:35:55 -0600
Subject: [PATCH] Ready

---
 ableos/assets/kernel.toml | 12 +-----------
 ableos/src/boot_conf.rs   | 14 --------------
 base/boot/kernel.toml     |  7 +++++++
 repbuild/src/main.rs      |  4 ++--
 4 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 base/boot/kernel.toml

diff --git a/ableos/assets/kernel.toml b/ableos/assets/kernel.toml
index efcb00c..81331d0 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 f3248c2..d2ec535 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<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>,
-}
diff --git a/base/boot/kernel.toml b/base/boot/kernel.toml
new file mode 100644
index 0000000..c375fcc
--- /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 b85004e..77660be 100644
--- a/repbuild/src/main.rs
+++ b/repbuild/src/main.rs
@@ -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(),
                             )?;