MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move some init configs into the base recipe

Browse Source
This commit is contained in:
bjorn3 2026-04-10 22:47:52 +02:00
parent 585ebfd8cb
commit 473bee2d66
13 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/acid.toml
View File

@ -16,7 +16,7 @@ ion = {}
[[files]]
path = "/usr/lib/init.d/10_acid"
data = """
requires_weak 00_drivers
requires_weak 00_base.target
ion /usr/lib/run_acid.ion
"""

2
config/auto-test.toml
View File

@ -15,7 +15,7 @@ auto-test = {}
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 10_net
requires_weak 10_net.target
ion /usr/lib/run_tests.ion
"""

28
config/base.toml
View File

@ -22,34 +22,6 @@ userutils = {}
uutils = {}
## Configuration files
[[files]]
path = "/usr/lib/init.d/00_base"
data = """
# clear and recreate tmpdir with 0o1777 permission
rm -rf /tmp
mkdir -m a=rwxt /tmp
notify ipcd
notify ptyd
nowait sudo --daemon
"""
[[files]]
path = "/usr/lib/init.d/00_drivers"
data = """
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 = """

2
config/desktop-minimal.toml
View File

@ -17,7 +17,7 @@ orbutils = {}
[[files]]
path = "/usr/lib/init.d/20_orbital"
data = """
requires_weak 10_net
requires_weak 10_net.target
notify audiod
nowait VT=3 orbital orblogin launcher
"""

2
config/minimal.toml
View File

@ -19,7 +19,7 @@ kibi = {}
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 10_net
requires_weak 10_net.target
inputd -A 2
nowait getty 2
nowait getty /scheme/debug/no-preserve -J

2
config/os-test.toml
View File

@ -16,7 +16,7 @@ os-test-bins = {} # Provides source and cross-compiled binaries
[[files]]
path = "/usr/lib/init.d/30_console"
data = """
requires_weak 10_net
requires_weak 10_net.target
RUST_BACKTRACE=full os-test-runner
shutdown
"""

2
config/redoxer-gui.toml
View File

@ -11,7 +11,7 @@ orbital = {}
[[files]]
path = "/usr/lib/init.d/30_redoxer"
data = """
requires_weak 10_net
requires_weak 10_net.target
echo
echo "## running redoxer in orbital ##"
nowait VT=3 orbital redoxerd

16
config/redoxer.toml
View File

@ -17,17 +17,23 @@ sed = {}
# Override to not background dhcpd
[[files]]
path = "/usr/lib/init.d/10_net"
path = "/usr/lib/init.d/10_dhcpd.service"
data = """
requires_weak 00_drivers
notify smolnetd
dhcpd
[unit]
description = "Network configuration using DHCP"
requires_weak = [
"10_smolnetd.service",
]
[service]
cmd = "dhcpd"
type = "oneshot"
"""
[[files]]
path = "/usr/lib/init.d/30_redoxer"
data = """
requires_weak 10_net
requires_weak 10_net.target
ion /usr/lib/run_redoxer.ion
"""

2
config/wayland.toml
View File

@ -32,7 +32,7 @@ xkeyboard-config = {}
[[files]]
path = "/usr/lib/init.d/20_orbital"
data = """
requires_weak 10_net
requires_weak 10_net.target
notify audiod
nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-wayland
"""

4
config/x11.toml
View File

@ -25,7 +25,7 @@ zenity = {}
[[files]]
path = "/usr/lib/init.d/10_dbus"
data = """
requires_weak 10_net
requires_weak 10_net.target
bash /usr/bin/start-dbus.sh
"""
@ -47,7 +47,7 @@ dbus-daemon --system
[[files]]
path = "/usr/lib/init.d/10_xenv"
data = """
requires_weak 10_net
requires_weak 10_net.target
glib-compile-schemas /usr/share/glib-2.0/schemas/
"""

2
config/x86_64/desktop-contain.toml
View File

@ -17,7 +17,7 @@ include = ["../desktop.toml"]
[[files]]
path = "/usr/lib/init.d/20_orbital"
data = """
requires_weak 10_net
requires_weak 10_net.target
notify audiod
nowait VT=3 orbital contain_orblogin launcher
"""

2
config/x86_64/server-demo.toml
View File

@ -38,7 +38,7 @@ website = {}
[[files]]
path = "/usr/lib/init.d/98_keygen_sh"
data = """
requires_weak 10_net
requires_weak 10_net.target
bash /root/keygen.sh
"""

7
recipes/core/base/recipe.toml
View File

@ -67,10 +67,13 @@ do
fi
done
mkdir -pv "${COOKBOOK_STAGE}/lib/pcid.d"
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/init.d/"
cp "${COOKBOOK_SOURCE}/init.d"/* "${COOKBOOK_STAGE}/usr/lib/init.d/"
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/pcid.d"
${FIND} "${COOKBOOK_SOURCE}/drivers" -maxdepth 3 -type f -name 'config.toml' | while read conf
do
driver="$(basename "$(dirname "$conf")")"
cp -v "$conf" "${COOKBOOK_STAGE}/lib/pcid.d/$driver.toml"
cp -v "$conf" "${COOKBOOK_STAGE}/usr/lib/pcid.d/$driver.toml"
done
"""