diff --git a/config/aarch64/acid.toml b/config/aarch64/acid.toml index ca8afca..f52664f 100644 --- a/config/aarch64/acid.toml +++ b/config/aarch64/acid.toml @@ -1,41 +1,3 @@ # Configuration for using acid -include = ["../base.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 -""" +include = ["../acid.toml"] diff --git a/config/aarch64/desktop-minimal.toml b/config/aarch64/desktop-minimal.toml index fa33cef..9f2c124 100644 --- a/config/aarch64/desktop-minimal.toml +++ b/config/aarch64/desktop-minimal.toml @@ -1,51 +1,3 @@ # Default desktop configuration -include = ["../base.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 -""" +include = ["../desktop-minimal.toml"] diff --git a/config/aarch64/raspi3bp/server-minimal.toml b/config/aarch64/raspi3bp/server-minimal.toml index ec9f949..59a8aa1 100644 --- a/config/aarch64/raspi3bp/server-minimal.toml +++ b/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 -prompt = false +# EFI partition size in MiB efi_partition_size = 128 diff --git a/config/aarch64/resist.toml b/config/aarch64/resist.toml index 85d23ba..dbf3e13 100644 --- a/config/aarch64/resist.toml +++ b/config/aarch64/resist.toml @@ -1,62 +1,3 @@ # Configuration for using resist -include = ["../net.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" +include = ["../resist.toml"] diff --git a/config/aarch64/server-minimal.toml b/config/aarch64/server-minimal.toml index 48272af..0649e0b 100644 --- a/config/aarch64/server-minimal.toml +++ b/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 diff --git a/config/acid.toml b/config/acid.toml new file mode 100644 index 0000000..2766f6b --- /dev/null +++ b/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 +""" diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml new file mode 100644 index 0000000..1349e9b --- /dev/null +++ b/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 +""" diff --git a/config/i686/acid.toml b/config/i686/acid.toml index ca8afca..f52664f 100644 --- a/config/i686/acid.toml +++ b/config/i686/acid.toml @@ -1,41 +1,3 @@ # Configuration for using acid -include = ["../base.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 -""" +include = ["../acid.toml"] diff --git a/config/i686/desktop-minimal.toml b/config/i686/desktop-minimal.toml index fa33cef..9f2c124 100644 --- a/config/i686/desktop-minimal.toml +++ b/config/i686/desktop-minimal.toml @@ -1,51 +1,3 @@ # Default desktop configuration -include = ["../base.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 -""" +include = ["../desktop-minimal.toml"] diff --git a/config/i686/resist.toml b/config/i686/resist.toml index 85d23ba..dbf3e13 100644 --- a/config/i686/resist.toml +++ b/config/i686/resist.toml @@ -1,62 +1,3 @@ # Configuration for using resist -include = ["../net.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" +include = ["../resist.toml"] diff --git a/config/i686/server-minimal.toml b/config/i686/server-minimal.toml index 48272af..0649e0b 100644 --- a/config/i686/server-minimal.toml +++ b/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 diff --git a/config/net.toml b/config/net.toml index 0711303..d785d06 100644 --- a/config/net.toml +++ b/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 = {} diff --git a/config/resist.toml b/config/resist.toml new file mode 100644 index 0000000..26aecd9 --- /dev/null +++ b/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" diff --git a/config/server-minimal.toml b/config/server-minimal.toml index f241832..bc44ee7 100644 --- a/config/server-minimal.toml +++ b/config/server-minimal.toml @@ -4,8 +4,8 @@ include = ["base.toml"] # General settings [general] -# Do not prompt if settings are not defined -prompt = false +# Filesystem size in MiB +filesystem_size = 128 # Package settings [packages] diff --git a/config/x86_64/acid.toml b/config/x86_64/acid.toml index ca8afca..f52664f 100644 --- a/config/x86_64/acid.toml +++ b/config/x86_64/acid.toml @@ -1,41 +1,3 @@ # Configuration for using acid -include = ["../base.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 -""" +include = ["../acid.toml"] diff --git a/config/x86_64/desktop-minimal.toml b/config/x86_64/desktop-minimal.toml index fa33cef..9f2c124 100644 --- a/config/x86_64/desktop-minimal.toml +++ b/config/x86_64/desktop-minimal.toml @@ -1,51 +1,3 @@ # Default desktop configuration -include = ["../base.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 -""" +include = ["../desktop-minimal.toml"] diff --git a/config/x86_64/resist.toml b/config/x86_64/resist.toml index 85d23ba..dbf3e13 100644 --- a/config/x86_64/resist.toml +++ b/config/x86_64/resist.toml @@ -1,62 +1,3 @@ # Configuration for using resist -include = ["../net.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" +include = ["../resist.toml"] diff --git a/config/x86_64/server-minimal.toml b/config/x86_64/server-minimal.toml index 48272af..0649e0b 100644 --- a/config/x86_64/server-minimal.toml +++ b/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