From 7ff5b1bd30863a6bd4e283d40975eb9178e82d76 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 4 Jan 2024 11:45:40 -0700
Subject: [PATCH] Use template for all server-minimal configs

---
 config/aarch64/raspi3bp/server-minimal.toml | 30 +----------------
 config/aarch64/server-minimal.toml          | 30 +----------------
 config/i686/server-minimal.toml             | 30 +----------------
 config/server-minimal.toml                  | 36 +++++++++++++++++++++
 config/x86_64/server-minimal.toml           | 30 +----------------
 5 files changed, 40 insertions(+), 116 deletions(-)
 create mode 100644 config/server-minimal.toml

diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml
index 3df20fe..ec9f949 100644
--- a/config/aarch64/raspi3bp/server-minimal.toml
+++ b/config/aarch64/raspi3bp/server-minimal.toml
@@ -1,6 +1,6 @@
 # Minimal configuration
 
-include = ["../base.toml"]
+include = ["../../server-minimal.toml"]
 
 # General settings
 [general]
@@ -9,31 +9,3 @@ filesystem_size = 256
 # Do not prompt if settings are not defined
 prompt = false
 efi_partition_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 = """
-getty 2
-getty debug: -J
-"""
diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml
index c4e887e..48272af 100644
--- a/config/aarch64/server-minimal.toml
+++ b/config/aarch64/server-minimal.toml
@@ -1,6 +1,6 @@
 # Minimal configuration
 
-include = ["../base.toml"]
+include = ["../server-minimal.toml"]
 
 # General settings
 [general]
@@ -8,31 +8,3 @@ include = ["../base.toml"]
 filesystem_size = 128
 # Do not prompt if settings are not defined
 prompt = false
-
-# 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 = """
-getty 2
-getty debug: -J
-"""
diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml
index c4e887e..48272af 100644
--- a/config/i686/server-minimal.toml
+++ b/config/i686/server-minimal.toml
@@ -1,6 +1,6 @@
 # Minimal configuration
 
-include = ["../base.toml"]
+include = ["../server-minimal.toml"]
 
 # General settings
 [general]
@@ -8,31 +8,3 @@ include = ["../base.toml"]
 filesystem_size = 128
 # Do not prompt if settings are not defined
 prompt = false
-
-# 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 = """
-getty 2
-getty debug: -J
-"""
diff --git a/config/server-minimal.toml b/config/server-minimal.toml
new file mode 100644
index 0000000..f241832
--- /dev/null
+++ b/config/server-minimal.toml
@@ -0,0 +1,36 @@
+# Minimal configuration
+
+include = ["base.toml"]
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# 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 = """
+getty 2
+getty debug: -J
+"""
diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml
index c4e887e..48272af 100644
--- a/config/x86_64/server-minimal.toml
+++ b/config/x86_64/server-minimal.toml
@@ -1,6 +1,6 @@
 # Minimal configuration
 
-include = ["../base.toml"]
+include = ["../server-minimal.toml"]
 
 # General settings
 [general]
@@ -8,31 +8,3 @@ include = ["../base.toml"]
 filesystem_size = 128
 # Do not prompt if settings are not defined
 prompt = false
-
-# 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 = """
-getty 2
-getty debug: -J
-"""