From 2b8585274e12d7a729f6ab65c345b4f8657b1cfd Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 14 Feb 2022 09:58:22 -0700
Subject: [PATCH] Move logd to initfs, update kernel

---
 config/acid.toml     | 2 --
 config/coreboot.toml | 2 --
 config/desktop.toml  | 2 --
 config/jeremy.toml   | 3 +--
 config/maximal.toml  | 3 +--
 config/minimal.toml  | 2 --
 config/resist.toml   | 2 --
 config/server.toml   | 2 --
 initfs.toml          | 4 +++-
 kernel               | 2 +-
 10 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/config/acid.toml b/config/acid.toml
index c284417..9427675 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -11,7 +11,6 @@ acid = {}
 coreutils = {}
 ion = {}
 ipcd = {}
-logd = {}
 ptyd = {}
 
 # User settings
@@ -30,7 +29,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 """
 
diff --git a/config/coreboot.toml b/config/coreboot.toml
index e6ffc07..eebaf41 100644
--- a/config/coreboot.toml
+++ b/config/coreboot.toml
@@ -74,7 +74,6 @@ ipcd = {}
 #libpng = {}
 #libsodium = {}
 #llvm = {}
-#logd = {}
 #lua = {}
 #mdp = {}
 #mesa = {}
@@ -179,7 +178,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-#logd
 ptyd
 #pcid /etc/pcid.d/
 """
diff --git a/config/desktop.toml b/config/desktop.toml
index f8dd8e5..144fe22 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -21,7 +21,6 @@ gnu-make = {}
 installer = {}
 ion = {}
 ipcd = {}
-logd = {}
 netdb = {}
 netstack = {}
 netsurf = {}
@@ -56,7 +55,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 pcid /etc/pcid.d/
 """
diff --git a/config/jeremy.toml b/config/jeremy.toml
index 32a2acd..7566368 100644
--- a/config/jeremy.toml
+++ b/config/jeremy.toml
@@ -67,7 +67,6 @@ libsodium = {}
 libvorbis = {}
 libxml2 = {}
 llvm = {}
-logd = {}
 mesa = {}
 mesa_glu = {}
 nasm = {}
@@ -106,6 +105,7 @@ resist = {}
 ripgrep = {}
 rodioplay = {}
 rs-nes = {}
+rust = {}
 rust64 = {}
 rust-cairo = {}
 rust-cairo-demo = {}
@@ -156,7 +156,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 pcid /etc/pcid.d/
 """
diff --git a/config/maximal.toml b/config/maximal.toml
index 383c0da..7ec44cb 100644
--- a/config/maximal.toml
+++ b/config/maximal.toml
@@ -82,7 +82,7 @@ libsodium = {}
 libvorbis = {}
 libxml2 = {}
 llvm = {}
-logd = {}
+#logd = {}
 #lua = {}
 #mdp = {}
 mesa = {}
@@ -200,7 +200,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 pcid /etc/pcid.d/
 """
diff --git a/config/minimal.toml b/config/minimal.toml
index 3234d14..8838b22 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -74,7 +74,6 @@ ipcd = {}
 #libpng = {}
 #libsodium = {}
 #llvm = {}
-logd = {}
 #lua = {}
 #mdp = {}
 #mesa = {}
@@ -176,7 +175,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 """
 
diff --git a/config/resist.toml b/config/resist.toml
index 11942e9..61ac32c 100644
--- a/config/resist.toml
+++ b/config/resist.toml
@@ -17,7 +17,6 @@ gcc = {}
 gnu-binutils = {}
 gnu-make = {}
 ipcd = {}
-logd = {}
 netdb = {}
 netstack = {}
 netutils = {}
@@ -42,7 +41,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 pcid /etc/pcid.d/
 """
diff --git a/config/server.toml b/config/server.toml
index bb1790d..fcbe1e9 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -19,7 +19,6 @@ gnu-make = {}
 installer = {}
 ion = {}
 ipcd = {}
-logd = {}
 netdb = {}
 netstack = {}
 netutils = {}
@@ -47,7 +46,6 @@ password = ""
 path = "/etc/init.d/00_base"
 data = """
 ipcd
-logd
 ptyd
 pcid /etc/pcid.d/
 """
diff --git a/initfs.toml b/initfs.toml
index dd860e7..2315166 100644
--- a/initfs.toml
+++ b/initfs.toml
@@ -9,6 +9,7 @@ prompt = false
 [packages]
 drivers = {}
 init = {}
+logd = {}
 nulld = {}
 #pciids = {}
 ramfs = {}
@@ -25,7 +26,8 @@ nulld
 zerod
 randd
 vesad T T G
-stdio display:1
+logd debug: display:1
+stdio log:
 ps2d us
 ramfs logging
 acpid
diff --git a/kernel b/kernel
index 52ad689..c1aa76b 160000
--- a/kernel
+++ b/kernel
@@ -1 +1 @@
-Subproject commit 52ad689d370c3452e6792b5354fa0b60573cfeda
+Subproject commit c1aa76bf3c952a63685ec7e743f8eea30afb2e67