Use templates for acid, desktop-minimal, resist, server-minimal

config/aarch64/acid.toml

@@ -1,41 +1,3 @@
 # Configuration for using acid
 
-include = ["../base.toml"]
+include = ["../acid.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-export RUST_BACKTRACE full
-acid
-acid create_test
-acid switch
-acid tls
-acid thread
-shutdown
-"""

config/aarch64/desktop-minimal.toml

@@ -1,51 +1,3 @@
 # Default desktop configuration
 
-include = ["../base.toml"]
+include = ["../desktop-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""

config/aarch64/raspi3bp/server-minimal.toml

@@ -6,6 +6,5 @@ include = ["../../server-minimal.toml"]
 [general]
 # Filesystem size in MiB
 filesystem_size = 256
-# Do not prompt if settings are not defined
+# EFI partition size in MiB
-prompt = false
 efi_partition_size = 128

config/aarch64/resist.toml

@@ -1,62 +1,3 @@
 # Configuration for using resist
 
-include = ["../net.toml"]
+include = ["../resist.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-# Override to not background dhcpd
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd
-"""
-
-[[files]]
-path = "/etc/init.d/20_resist"
-data = """
-export RUST_BACKTRACE full
-resist /share/resist/redox/spec.toml
-resist /share/resist/posix/base.toml
-resist /share/resist/posix/shell.toml
-shutdown
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"

config/aarch64/server-minimal.toml

@@ -1,10 +1,3 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false

config/acid.toml

@@ -0,0 +1,39 @@
+# Configuration for using acid
+
+include = ["base.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+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"
+data = """
+export RUST_BACKTRACE full
+acid
+acid create_test
+acid switch
+acid tls
+acid thread
+shutdown
+"""

config/desktop-minimal.toml

@@ -0,0 +1,49 @@
+# Default desktop configuration
+
+include = ["base.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+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"
+data = """
+ipcd
+ptyd
+pcid /etc/pcid.d/
+escalated
+"""
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+orbital orblogin launcher
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty 2
+getty debug: -J
+"""

config/i686/acid.toml

@@ -1,41 +1,3 @@
 # Configuration for using acid
 
-include = ["../base.toml"]
+include = ["../acid.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-export RUST_BACKTRACE full
-acid
-acid create_test
-acid switch
-acid tls
-acid thread
-shutdown
-"""

config/i686/desktop-minimal.toml

@@ -1,51 +1,3 @@
 # Default desktop configuration
 
-include = ["../base.toml"]
+include = ["../desktop-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""

config/i686/resist.toml

@@ -1,62 +1,3 @@
 # Configuration for using resist
 
-include = ["../net.toml"]
+include = ["../resist.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-# Override to not background dhcpd
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd
-"""
-
-[[files]]
-path = "/etc/init.d/20_resist"
-data = """
-export RUST_BACKTRACE full
-resist /share/resist/redox/spec.toml
-resist /share/resist/posix/base.toml
-resist /share/resist/posix/shell.toml
-shutdown
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"

config/i686/server-minimal.toml

@@ -1,10 +1,3 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false

config/net.toml

@@ -3,11 +3,6 @@
 
 include = ["base.toml"]
 
-# General settings
-[general]
-# Do not prompt if settings are not defined
-prompt = false
-
 ## Network packages
 [packages]
 netstack = {}

config/resist.toml

@@ -0,0 +1,60 @@
+# Configuration for using resist
+
+include = ["net.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+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"
+data = """
+ipcd
+ptyd
+pcid /etc/pcid.d/
+escalated
+"""
+
+# Override to not background dhcpd
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd
+"""
+
+[[files]]
+path = "/etc/init.d/20_resist"
+data = """
+export RUST_BACKTRACE full
+resist /share/resist/redox/spec.toml
+resist /share/resist/posix/base.toml
+resist /share/resist/posix/shell.toml
+shutdown
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"

config/server-minimal.toml

@@ -4,8 +4,8 @@ include = ["base.toml"]
 
 # General settings
 [general]
-# Do not prompt if settings are not defined
+# Filesystem size in MiB
-prompt = false
+filesystem_size = 128
 
 # Package settings
 [packages]

config/x86_64/acid.toml

@@ -1,41 +1,3 @@
 # Configuration for using acid
 
-include = ["../base.toml"]
+include = ["../acid.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-export RUST_BACKTRACE full
-acid
-acid create_test
-acid switch
-acid tls
-acid thread
-shutdown
-"""

config/x86_64/desktop-minimal.toml

@@ -1,51 +1,3 @@
 # Default desktop configuration
 
-include = ["../base.toml"]
+include = ["../desktop-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""

config/x86_64/resist.toml

@@ -1,62 +1,3 @@
 # Configuration for using resist
 
-include = ["../net.toml"]
+include = ["../resist.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# 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"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-# Override to not background dhcpd
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd
-"""
-
-[[files]]
-path = "/etc/init.d/20_resist"
-data = """
-export RUST_BACKTRACE full
-resist /share/resist/redox/spec.toml
-resist /share/resist/posix/base.toml
-resist /share/resist/posix/shell.toml
-shutdown
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"

config/x86_64/server-minimal.toml

@@ -1,10 +1,3 @@
 # Minimal configuration
 
 include = ["../server-minimal.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false