MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 22:04:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'config_always_net' into 'master'

Browse Source 
Support networking in all configs

See merge request redox-os/redox!1960
This commit is contained in:
Jeremy Soller 2026-03-01 07:38:52 -07:00
commit 94da2707f0
13 changed files with 44 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/aarch64/minimal-net.toml
View File

@ -1,14 +0,0 @@
# Minimal network configuration
include = ["../minimal-net.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}

2
config/acid.toml
View File

@ -1,6 +1,6 @@
# Configuration for "acid" testing
include = ["net.toml"]
include = ["base.toml"]
# General settings
[general]

2
config/auto-test.toml
View File

@ -1,7 +1,7 @@
# Configuration for automated testing of essential test suites
# Smaller test suites are executed first to catch possible bugs or regressions faster
include = ["net.toml"]
include = ["base.toml"]
# General settings
[general]

36
config/base.toml
View File

@ -15,6 +15,8 @@ bootloader = {}
kernel = {}
libgcc = {}
libstdcxx = {}
netdb = {}
netutils = {}
relibc = {}
userutils = {}
uutils = {}
@ -39,6 +41,15 @@ requires_weak 00_base
pcid-spawner
"""
## Network init
[[files]]
path = "/usr/lib/init.d/10_net"
data = """
requires_weak 00_drivers
notify smolnetd
nowait dhcpd
"""
[[files]]
path = "/etc/login_schemes.toml"
data = """
@ -87,6 +98,31 @@ schemes = [
path = "/etc/hostname"
data = "redox"
## Default net configuration (optimized for QEMU)
[[files]]
path = "/etc/net/dns"
data = """
9.9.9.9
"""
[[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
"""
# https://www.freedesktop.org/software/systemd/man/latest/os-release.html
[[files]]
path = "/usr/lib/os-release"

2
config/desktop-minimal.toml
View File

@ -1,6 +1,6 @@
# Minimal desktop configuration
include = ["minimal-net.toml"]
include = ["minimal.toml"]
# General settings
[general]

14
config/i586/minimal-net.toml
View File

@ -1,14 +0,0 @@
# Minimal network configuration
include = ["../minimal-net.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}

29
config/minimal-net.toml
View File

@ -1,29 +0,0 @@
# Minimal network configuration
include = ["net.toml"]
# General settings
[general]
# Filesystem size in MiB
filesystem_size = 256
# Package settings
[packages]
ca-certificates = {}
coreutils = {}
extrautils = {}
findutils = {}
ion = {}
netdb = {}
pkgutils = {}
kibi = {}
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 10_net
inputd -A 2
nowait getty 2
nowait getty /scheme/debug -J
"""

4
config/minimal.toml
View File

@ -9,15 +9,17 @@ filesystem_size = 196
# Package settings
[packages]
ca-certificates = {}
coreutils = {}
extrautils = {}
ion = {}
pkgutils = {}
kibi = {}
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 00_drivers
requires_weak 10_net
inputd -A 2
nowait getty 2
nowait getty /scheme/debug/no-preserve -J

43
config/net.toml
View File

@ -1,43 +0,0 @@
# Network configuration: includes the base configuration and adds files required
# for networking
include = ["base.toml"]
# Package settings
[packages]
netdb = {}
netutils = {}
## Network init
[[files]]
path = "/usr/lib/init.d/10_net"
data = """
requires_weak 00_drivers
notify smolnetd
nowait dhcpd
"""
## Default net configuration (optimized for QEMU)
[[files]]
path = "/etc/net/dns"
data = """
9.9.9.9
"""
[[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
"""

3
config/redoxer.toml
View File

@ -1,6 +1,6 @@
# Configuration for the Redoxer image
include = ["net.toml"]
include = ["base.toml"]
# Package settings
[packages]
@ -11,7 +11,6 @@ extrautils = {}
findutils = {}
gnu-make = {}
ion = {}
netdb = {}
pkgutils = {}
relibc = {}
sed = {}

14
config/riscv64gc/minimal-net.toml
View File

@ -1,14 +0,0 @@
# Minimal network configuration
include = ["../minimal-net.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}

16
config/server.toml
View File

@ -1,6 +1,6 @@
# Server configuration
include = ["net.toml"]
include = ["minimal.toml"]
# General settings
[general]
@ -11,25 +11,11 @@ filesystem_size = 512
[packages]
bash = {}
bottom = {}
ca-certificates = {}
#contain = {} # needs to update dependencies
coreutils = {}
curl = {}
diffutils = {}
extrautils = {}
findutils = {}
git = {}
installer = {}
ion = {}
kibi = {}
pkgutils = {}
redoxfs = {}
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 10_net
inputd -A 2
nowait getty 2
nowait getty /scheme/debug/no-preserve -J
"""

14
config/x86_64/minimal-net.toml
View File

@ -1,14 +0,0 @@
# Minimal network configuration
include = ["../minimal-net.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}