vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add net config template

Browse source
This commit is contained in:
Jeremy Soller 2024-01-04 11:08:53 -07:00
parent 28f04a167a
commit a0e7ff99df
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
28 changed files with 95 additions and 1017 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
config/aarch64/demo.toml
View file

@ -1,6 +1,6 @@
# Default demo configuration # Default demo configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -29,9 +29,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
#netsurf = {} # lots of porting issues #netsurf = {} # lots of porting issues
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -70,14 +68,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -92,44 +82,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -137,9 +93,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

10
config/aarch64/desktop-minimal.toml
View file

@ -65,10 +65,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -76,9 +72,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/aarch64/desktop.toml
View file

@ -1,6 +1,6 @@
# Default desktop configuration # Default desktop configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -29,9 +29,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
#netsurf = {} # lots of porting issues #netsurf = {} # lots of porting issues
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -70,14 +68,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -92,44 +82,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -137,9 +93,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/aarch64/dev.toml
View file

@ -1,6 +1,6 @@
# Configuration for development, includes cargo and rustc # Configuration for development, includes cargo and rustc
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -91,14 +89,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -113,44 +103,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -158,9 +114,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/aarch64/jeremy.toml
View file

@ -1,6 +1,6 @@
# Default desktop configuration # Default desktop configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -29,9 +29,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
#netsurf = {} # lots of porting issues #netsurf = {} # lots of porting issues
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -66,14 +64,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -88,44 +78,10 @@ getty display:2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -133,9 +89,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

10
config/aarch64/raspi3bp/server-minimal.toml
View file

@ -53,10 +53,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -64,9 +60,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

45
config/aarch64/resist.toml
View file

@ -1,6 +1,6 @@
# Configuration for using resist # Configuration for using resist
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -27,8 +27,6 @@ initfs = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
ptyd = {} ptyd = {}
resist = {} resist = {}
userutils = {} userutils = {}
@ -55,6 +53,7 @@ pcid /etc/pcid.d/
escalated escalated
""" """
# Override to not background dhcpd
[[files]] [[files]]
path = "/etc/init.d/10_net" path = "/etc/init.d/10_net"
data = """ data = """
@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml
shutdown shutdown
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -118,9 +83,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

10
config/aarch64/server-minimal.toml
View file

@ -52,10 +52,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -63,9 +59,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/aarch64/server.toml
View file

@ -1,6 +1,6 @@
# Default server configuration # Default server configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -31,8 +31,6 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
# FIXME: failed to build # FIXME: failed to build
# pkgutils = {} # pkgutils = {}
ptyd = {} ptyd = {}
@ -67,14 +65,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/30_console" path = "/etc/init.d/30_console"
data = """ data = """
@ -83,44 +73,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -128,9 +84,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

14
config/base.toml
View file

@ -8,6 +8,18 @@
# Do not prompt if settings are not defined # Do not prompt if settings are not defined
prompt = false prompt = false
## Configuration files
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
## Symlinks for usrmerge
[[files]] [[files]]
path = "/usr/bin" path = "/usr/bin"
data = "../bin" data = "../bin"
@ -28,6 +40,7 @@ path = "/usr/share"
data = "../share" data = "../share"
symlink = true symlink = true
## /tmp directory with special mode
[[files]] [[files]]
path = "/tmp" path = "/tmp"
data = "" data = ""
@ -35,6 +48,7 @@ directory = true
# 0o1777 # 0o1777
mode = 1023 mode = 1023
## Device file symlinks
[[files]] [[files]]
path = "/dev/null" path = "/dev/null"
data = "null:" data = "null:"

52
config/i686/demo.toml
View file

@ -22,7 +22,7 @@
# # # #
############################################################################## ##############################################################################
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -52,9 +52,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -105,14 +103,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -127,44 +117,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -173,12 +129,6 @@ user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]] [[files]]
path = "/home/user/Welcome.txt" path = "/home/user/Welcome.txt"
data = """ data = """

10
config/i686/desktop-minimal.toml
View file

@ -65,10 +65,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -76,9 +72,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/i686/desktop.toml
View file

@ -1,6 +1,6 @@
# Default desktop configuration # Default desktop configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -71,14 +69,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -93,44 +83,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -138,9 +94,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/i686/dev.toml
View file

@ -1,6 +1,6 @@
# Configuration for development, includes cargo and rustc # Configuration for development, includes cargo and rustc
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -91,14 +89,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -113,44 +103,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -158,9 +114,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/i686/jeremy.toml
View file

@ -1,6 +1,6 @@
# Jeremy's configuration # Jeremy's configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -98,14 +96,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -120,44 +110,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -166,12 +122,6 @@ user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]] [[files]]
path = "/home/user/Welcome.txt" path = "/home/user/Welcome.txt"
data = """ data = """

45
config/i686/resist.toml
View file

@ -1,6 +1,6 @@
# Configuration for using resist # Configuration for using resist
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -27,8 +27,6 @@ initfs = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
ptyd = {} ptyd = {}
resist = {} resist = {}
userutils = {} userutils = {}
@ -55,6 +53,7 @@ pcid /etc/pcid.d/
escalated escalated
""" """
# Override to not background dhcpd
[[files]] [[files]]
path = "/etc/init.d/10_net" path = "/etc/init.d/10_net"
data = """ data = """
@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml
shutdown shutdown
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -118,9 +83,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

10
config/i686/server-minimal.toml
View file

@ -52,10 +52,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -63,9 +59,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/i686/server.toml
View file

@ -1,6 +1,6 @@
# Default server configuration # Default server configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -28,8 +28,6 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
pkgutils = {} pkgutils = {}
ptyd = {} ptyd = {}
redoxfs = {} redoxfs = {}
@ -63,14 +61,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/30_console" path = "/etc/init.d/30_console"
data = """ data = """
@ -79,44 +69,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -124,9 +80,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

54
config/net.toml Normal file
View file

@ -0,0 +1,54 @@
# Net configuration: includes the base configuration and adds files required
# for networking
include = ["base.toml"]
# General settings
[general]
# Do not prompt if settings are not defined
prompt = false
## Network packages
[packages]
netstack = {}
netutils = {}
## Network init
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
## Default net configuration (optimized for QEMU)
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""

52
config/x86_64/demo.toml
View file

@ -22,7 +22,7 @@
# # # #
############################################################################## ##############################################################################
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -55,9 +55,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -126,14 +124,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -148,44 +138,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -194,12 +150,6 @@ user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]] [[files]]
path = "/home/user/Welcome.txt" path = "/home/user/Welcome.txt"
data = """ data = """

52
config/x86_64/desktop-contain.toml
View file

@ -1,6 +1,6 @@
# Default desktop configuration # Default desktop configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -71,14 +69,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -93,44 +83,10 @@ getty 2
getty --contain debug: -J getty --contain debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -139,12 +95,6 @@ user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""
[[files]] [[files]]
path = "/etc/contain.toml" path = "/etc/contain.toml"
data = """ data = """

10
config/x86_64/desktop-minimal.toml
View file

@ -65,10 +65,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -76,9 +72,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/x86_64/desktop.toml
View file

@ -1,6 +1,6 @@
# Default desktop configuration # Default desktop configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -71,14 +69,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -93,44 +83,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -138,9 +94,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/x86_64/dev.toml
View file

@ -1,6 +1,6 @@
# Configuration for development, includes cargo and rustc # Configuration for development, includes cargo and rustc
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -91,14 +89,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -113,44 +103,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -158,9 +114,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

59
config/x86_64/jeremy.toml
View file

@ -1,6 +1,6 @@
# Jeremy's configuration # Jeremy's configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -30,9 +30,7 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netsurf = {} netsurf = {}
netutils = {}
orbdata = {} orbdata = {}
orbital = {} orbital = {}
orbterm = {} orbterm = {}
@ -49,6 +47,8 @@ uutils = {}
# apps # apps
cosmic-edit = {} cosmic-edit = {}
cosmic-files = {}
cosmic-term = {}
cosmic-text = {} cosmic-text = {}
periodictable = {} periodictable = {}
pixelcannon = {} pixelcannon = {}
@ -63,6 +63,7 @@ ffmpeg6 = {}
git = {} git = {}
gnu-grep = {} gnu-grep = {}
lua54 = {} lua54 = {}
nano = {}
perg = {} perg = {}
ripgrep = {} ripgrep = {}
rustpython = {} rustpython = {}
@ -97,13 +98,13 @@ winit = {}
autoconf = {} autoconf = {}
automake = {} automake = {}
#cargo = {} # openssl issues #cargo = {} # openssl issues
gcc13 = {} #gcc13 = {} # libiberty errors
gnu-binutils = {} gnu-binutils = {}
gnu-make = {} gnu-make = {}
nasm = {} nasm = {}
patch = {} patch = {}
pkg-config = {} pkg-config = {}
rust = {} #rust = {} # takes too long to compile
rustpython = {} rustpython = {}
# games # games
@ -171,14 +172,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/20_orbital" path = "/etc/init.d/20_orbital"
data = """ data = """
@ -193,44 +186,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -238,9 +197,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

45
config/x86_64/resist.toml
View file

@ -1,6 +1,6 @@
# Configuration for using resist # Configuration for using resist
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -27,8 +27,6 @@ initfs = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
ptyd = {} ptyd = {}
resist = {} resist = {}
userutils = {} userutils = {}
@ -55,6 +53,7 @@ pcid /etc/pcid.d/
escalated escalated
""" """
# Override to not background dhcpd
[[files]] [[files]]
path = "/etc/init.d/10_net" path = "/etc/init.d/10_net"
data = """ data = """
@ -73,44 +72,10 @@ resist /share/resist/posix/shell.toml
shutdown shutdown
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -118,9 +83,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

10
config/x86_64/server-minimal.toml
View file

@ -52,10 +52,6 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -63,9 +59,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""

52
config/x86_64/server.toml
View file

@ -1,6 +1,6 @@
# Default server configuration # Default server configuration
include = ["../base.toml"] include = ["../net.toml"]
# General settings # General settings
[general] [general]
@ -28,8 +28,6 @@ ion = {}
ipcd = {} ipcd = {}
kernel = {} kernel = {}
netdb = {} netdb = {}
netstack = {}
netutils = {}
pkgutils = {} pkgutils = {}
ptyd = {} ptyd = {}
redoxfs = {} redoxfs = {}
@ -63,14 +61,6 @@ pcid /etc/pcid.d/
escalated escalated
""" """
[[files]]
path = "/etc/init.d/10_net"
data = """
smolnetd
dnsd
dhcpd -b
"""
[[files]] [[files]]
path = "/etc/init.d/30_console" path = "/etc/init.d/30_console"
data = """ data = """
@ -79,44 +69,10 @@ getty 2
getty debug: -J getty debug: -J
""" """
[[files]]
path = "/etc/net/dns"
data = """
208.67.222.222
"""
[[files]]
path = "/etc/net/ip"
data = """
10.0.2.15
"""
[[files]]
path = "/etc/net/ip_router"
data = """
10.0.2.2
"""
[[files]]
path = "/etc/net/ip_subnet"
data = """
255.255.255.0
"""
[[files]]
path = "/etc/net/mac"
data = """
54-52-00-ab-cd-ef
"""
[[files]] [[files]]
path = "/etc/pkg.d/50_redox" path = "/etc/pkg.d/50_redox"
data = "https://static.redox-os.org/pkg" data = "https://static.redox-os.org/pkg"
[[files]]
path = "/etc/redox-release"
data = "0.8.0"
[[files]] [[files]]
path = "/etc/group" path = "/etc/group"
data = """ data = """
@ -124,9 +80,3 @@ root;0;root
user;1000;user user;1000;user
sudo;1;user sudo;1;user
""" """
[[files]]
path = "/etc/hostname"
data = """
redox
"""