From c54bfd99cec19d98a1ac8ae7e1fba3a43bc1b76e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 4 Jan 2024 13:40:31 -0700 Subject: [PATCH] Make template desktop and server configs --- config/desktop.toml | 33 +++++++++++++++++++++ config/i686/desktop.toml | 59 +------------------------------------- config/i686/server.toml | 45 +---------------------------- config/server.toml | 44 ++++++++++++++++++++++++++++ config/x86_64/desktop.toml | 59 +------------------------------------- config/x86_64/server.toml | 45 +---------------------------- 6 files changed, 81 insertions(+), 204 deletions(-) create mode 100644 config/desktop.toml create mode 100644 config/server.toml diff --git a/config/desktop.toml b/config/desktop.toml new file mode 100644 index 0000000..ca1131b --- /dev/null +++ b/config/desktop.toml @@ -0,0 +1,33 @@ +# Default desktop configuration + +include = ["server.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 512 + +# Package settings +[packages] +audiod = {} +installer-gui = {} +netsurf = {} +orbdata = {} +orbital = {} +orbterm = {} +orbutils = {} + +[[files]] +path = "/etc/init.d/20_orbital" +data = """ +audiod +orbital orblogin launcher +""" + +# Override console config to not switch to VT 2 +[[files]] +path = "/etc/init.d/30_console" +data = """ +getty 2 +getty debug: -J +""" diff --git a/config/i686/desktop.toml b/config/i686/desktop.toml index 9569af6..0cfd7c3 100644 --- a/config/i686/desktop.toml +++ b/config/i686/desktop.toml @@ -1,60 +1,3 @@ # Default desktop configuration -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 512 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -audiod = {} -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -installer-gui = {} -ion = {} -netdb = {} -netsurf = {} -orbdata = {} -orbital = {} -orbterm = {} -orbutils = {} -pkgutils = {} -redoxfs = {} -relibc = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -git = {} -curl = {} -vim = {} - -[[files]] -path = "/etc/init.d/20_orbital" -data = """ -audiod -orbital orblogin launcher -""" - -[[files]] -path = "/etc/init.d/30_console" -data = """ -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../desktop.toml"] diff --git a/config/i686/server.toml b/config/i686/server.toml index 20a8968..c0269cc 100644 --- a/config/i686/server.toml +++ b/config/i686/server.toml @@ -1,46 +1,3 @@ # Default server configuration -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 512 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -ion = {} -netdb = {} -pkgutils = {} -redoxfs = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -git = {} -curl = {} -vim = {} - -[[files]] -path = "/etc/init.d/30_console" -data = """ -inputd -A 2 -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../server.toml"] diff --git a/config/server.toml b/config/server.toml new file mode 100644 index 0000000..244347f --- /dev/null +++ b/config/server.toml @@ -0,0 +1,44 @@ +# Default server configuration + +include = ["net.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 512 + +# Package settings +[packages] +bash = {} +bootloader = {} +ca-certificates = {} +contain = {} +coreutils = {} +curl = {} +diffutils = {} +extrautils = {} +findutils = {} +git = {} +installer = {} +ion = {} +netdb = {} +pkgutils = {} +redoxfs = {} +relibc = {} +resist = {} +smith = {} +userutils = {} +uutils = {} +vim = {} + +[[files]] +path = "/etc/init.d/30_console" +data = """ +inputd -A 2 +getty 2 +getty debug: -J +""" + +[[files]] +path = "/etc/pkg.d/50_redox" +data = "https://static.redox-os.org/pkg" diff --git a/config/x86_64/desktop.toml b/config/x86_64/desktop.toml index 9569af6..0cfd7c3 100644 --- a/config/x86_64/desktop.toml +++ b/config/x86_64/desktop.toml @@ -1,60 +1,3 @@ # Default desktop configuration -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 512 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -audiod = {} -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -installer-gui = {} -ion = {} -netdb = {} -netsurf = {} -orbdata = {} -orbital = {} -orbterm = {} -orbutils = {} -pkgutils = {} -redoxfs = {} -relibc = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -git = {} -curl = {} -vim = {} - -[[files]] -path = "/etc/init.d/20_orbital" -data = """ -audiod -orbital orblogin launcher -""" - -[[files]] -path = "/etc/init.d/30_console" -data = """ -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../desktop.toml"] diff --git a/config/x86_64/server.toml b/config/x86_64/server.toml index 20a8968..c0269cc 100644 --- a/config/x86_64/server.toml +++ b/config/x86_64/server.toml @@ -1,46 +1,3 @@ # Default server configuration -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 512 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -ion = {} -netdb = {} -pkgutils = {} -redoxfs = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -git = {} -curl = {} -vim = {} - -[[files]] -path = "/etc/init.d/30_console" -data = """ -inputd -A 2 -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../server.toml"]