From 72365aca16e0c2802e0e4e7c1036af8b43647e4b Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 4 Jan 2024 13:15:16 -0700
Subject: [PATCH] Move escalated, ipcd, and ptyd to base

---
 config/acid.toml            | 13 -------------
 config/base.toml            | 11 +++++++++++
 config/desktop-minimal.toml | 23 ++---------------------
 config/resist.toml          |  9 +--------
 config/server-minimal.toml  | 12 ------------
 5 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/config/acid.toml b/config/acid.toml
index 2766f6b..81398a3 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -9,22 +9,9 @@ filesystem_size = 256
 
 # Package settings
 [packages]
-bootloader = {}
 acid = {}
 coreutils = {}
-# TODO: Does this need escalated?
-escalated = {}
 ion = {}
-ipcd = {}
-ptyd = {}
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-escalated
-"""
 
 [[files]]
 path = "/etc/init.d/10_acid"
diff --git a/config/base.toml b/config/base.toml
index d3c5906..7546b5c 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -10,10 +10,21 @@ prompt = false
 
 [packages]
 bootstrap = {}
+escalated = {}
 initfs = {}
+ipcd = {}
 kernel = {}
+ptyd = {}
 
 ## Configuration files
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+ipcd
+ptyd
+escalated
+"""
+
 [[files]]
 path = "/etc/hostname"
 data = """
diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 1349e9b..010b141 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -1,6 +1,6 @@
 # Default desktop configuration
 
-include = ["base.toml"]
+include = ["server-minimal.toml"]
 
 # General settings
 [general]
@@ -9,30 +9,18 @@ filesystem_size = 128
 
 # Package settings
 [packages]
-coreutils = {}
 drivers = {}
-escalated = {}
-extrautils = {}
-ion = {}
-ipcd = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils-background = {}
 orbutils-launcher = {}
 orbutils-orblogin = {}
-ptyd = {}
-smith = {}
-userutils = {}
-uutils = {}
 
 [[files]]
-path = "/etc/init.d/00_base"
+path = "/etc/init.d/00_drivers"
 data = """
-ipcd
-ptyd
 pcid /etc/pcid.d/
-escalated
 """
 
 [[files]]
@@ -40,10 +28,3 @@ path = "/etc/init.d/20_orbital"
 data = """
 orbital orblogin launcher
 """
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""
diff --git a/config/resist.toml b/config/resist.toml
index 26aecd9..928ac3d 100644
--- a/config/resist.toml
+++ b/config/resist.toml
@@ -10,30 +10,23 @@ filesystem_size = 256
 # Package settings
 [packages]
 bash = {}
-bootloader = {}
 coreutils = {}
 diffutils = {}
 drivers = {}
-escalated = {}
 extrautils = {}
 findutils = {}
 gcc13 = {}
 gnu-binutils = {}
 gnu-make = {}
-ipcd = {}
 netdb = {}
-ptyd = {}
 resist = {}
 userutils = {}
 uutils = {}
 
 [[files]]
-path = "/etc/init.d/00_base"
+path = "/etc/init.d/00_drivers"
 data = """
-ipcd
-ptyd
 pcid /etc/pcid.d/
-escalated
 """
 
 # Override to not background dhcpd
diff --git a/config/server-minimal.toml b/config/server-minimal.toml
index bc44ee7..b1bf6e5 100644
--- a/config/server-minimal.toml
+++ b/config/server-minimal.toml
@@ -9,25 +9,13 @@ filesystem_size = 128
 
 # Package settings
 [packages]
-bootloader = {}
 coreutils = {}
-escalated = {}
 extrautils = {}
 ion = {}
-ipcd = {}
-ptyd = {}
 smith = {}
 userutils = {}
 uutils = {}
 
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-escalated
-"""
-
 [[files]]
 path = "/etc/init.d/30_console"
 data = """