From 474729b4f2a343affa51dabfdc9590d190b21592 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 25 Feb 2026 22:38:55 +0100 Subject: [PATCH] Specify dependencies between init scripts This aims to reproduce the current execution order of init scripts, not to provide the minimal set of dependencies. That can be implemented later. --- config/acid.toml | 1 + config/auto-test.toml | 1 + config/base.toml | 1 + config/desktop-minimal.toml | 2 ++ config/desktop.toml | 2 ++ config/llvm.toml | 1 + config/minimal-net.toml | 1 + config/minimal.toml | 1 + config/net.toml | 1 + config/os-test.toml | 1 + config/redoxer-gui.toml | 1 + config/redoxer.toml | 2 ++ config/server.toml | 1 + config/wayland.toml | 1 + config/x11.toml | 4 ++++ config/x86_64/desktop-contain.toml | 2 ++ config/x86_64/server-demo.toml | 2 ++ 17 files changed, 25 insertions(+) diff --git a/config/acid.toml b/config/acid.toml index 3344c228..01670c60 100644 --- a/config/acid.toml +++ b/config/acid.toml @@ -16,6 +16,7 @@ ion = {} [[files]] path = "/usr/lib/init.d/10_acid" data = """ +requires_weak 00_drivers ion /usr/lib/run_acid.ion """ diff --git a/config/auto-test.toml b/config/auto-test.toml index 483b01c8..a18ab8cb 100644 --- a/config/auto-test.toml +++ b/config/auto-test.toml @@ -15,6 +15,7 @@ auto-test = {} [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 10_net ion /usr/lib/run_tests.ion """ diff --git a/config/base.toml b/config/base.toml index 2e55ed92..e7587af0 100644 --- a/config/base.toml +++ b/config/base.toml @@ -35,6 +35,7 @@ nowait sudo --daemon [[files]] path = "/usr/lib/init.d/00_drivers" data = """ +requires_weak 00_base pcid-spawner """ diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml index c03d3c12..a4b2eafc 100644 --- a/config/desktop-minimal.toml +++ b/config/desktop-minimal.toml @@ -19,6 +19,7 @@ orbutils-orblogin = {} [[files]] path = "/usr/lib/init.d/20_orbital" data = """ +requires_weak 10_net nowait VT=3 orbital orblogin launcher """ @@ -26,6 +27,7 @@ nowait VT=3 orbital orblogin launcher [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 20_orbital nowait getty 2 nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/desktop.toml b/config/desktop.toml index 9fb0a7d9..26b8c0d4 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -29,6 +29,7 @@ shared-mime-info = {} [[files]] path = "/usr/lib/init.d/20_orbital" data = """ +requires_weak 10_net notify audiod nowait BROWSER=/bin/netsurf-fb VT=3 orbital orblogin launcher """ @@ -37,6 +38,7 @@ nowait BROWSER=/bin/netsurf-fb VT=3 orbital orblogin launcher [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 20_orbital nowait getty 2 nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/llvm.toml b/config/llvm.toml index 6a005c7b..20f33c43 100644 --- a/config/llvm.toml +++ b/config/llvm.toml @@ -12,6 +12,7 @@ llvm20 = {} [[files]] path = "/usr/lib/init.d/99_gen_llvm-config-generate" data = """ +requires_weak 00_drivers bash /usr/bin/llvm-config-generate """ diff --git a/config/minimal-net.toml b/config/minimal-net.toml index 4c81b43c..2696d0bb 100644 --- a/config/minimal-net.toml +++ b/config/minimal-net.toml @@ -21,6 +21,7 @@ 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 diff --git a/config/minimal.toml b/config/minimal.toml index 571e3613..93556938 100644 --- a/config/minimal.toml +++ b/config/minimal.toml @@ -17,6 +17,7 @@ kibi = {} [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 00_drivers inputd -A 2 nowait getty 2 nowait getty /scheme/debug/no-preserve -J diff --git a/config/net.toml b/config/net.toml index e4c26eaf..5dc2d979 100644 --- a/config/net.toml +++ b/config/net.toml @@ -12,6 +12,7 @@ netutils = {} [[files]] path = "/usr/lib/init.d/10_net" data = """ +requires_weak 00_drivers notify smolnetd nowait dhcpd """ diff --git a/config/os-test.toml b/config/os-test.toml index 5f841f56..58ed1b4b 100644 --- a/config/os-test.toml +++ b/config/os-test.toml @@ -16,6 +16,7 @@ os-test-bins = {} # Provides source and cross-compiled binaries [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 10_net RUST_BACKTRACE=full os-test-runner shutdown """ diff --git a/config/redoxer-gui.toml b/config/redoxer-gui.toml index 79d42dae..c3e6149a 100644 --- a/config/redoxer-gui.toml +++ b/config/redoxer-gui.toml @@ -11,6 +11,7 @@ orbital = {} [[files]] path = "/usr/lib/init.d/30_redoxer" data = """ +requires_weak 10_net echo echo "## running redoxer in orbital ##" nowait VT=3 orbital redoxerd diff --git a/config/redoxer.toml b/config/redoxer.toml index 79bf1707..83636f28 100644 --- a/config/redoxer.toml +++ b/config/redoxer.toml @@ -20,6 +20,7 @@ sed = {} [[files]] path = "/usr/lib/init.d/10_net" data = """ +requires_weak 00_drivers notify smolnetd dhcpd """ @@ -27,6 +28,7 @@ dhcpd [[files]] path = "/usr/lib/init.d/30_redoxer" data = """ +requires_weak 10_net ion /usr/lib/run_redoxer.ion """ diff --git a/config/server.toml b/config/server.toml index 5e985216..3c7df611 100644 --- a/config/server.toml +++ b/config/server.toml @@ -28,6 +28,7 @@ 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 diff --git a/config/wayland.toml b/config/wayland.toml index 5e875986..ae7cfe98 100644 --- a/config/wayland.toml +++ b/config/wayland.toml @@ -32,6 +32,7 @@ xkeyboard-config = {} [[files]] path = "/usr/lib/init.d/20_orbital" data = """ +requires_weak 10_net notify audiod nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-wayland """ diff --git a/config/x11.toml b/config/x11.toml index 2dfb57ad..f393e4e9 100644 --- a/config/x11.toml +++ b/config/x11.toml @@ -25,6 +25,7 @@ zenity = {} [[files]] path = "/usr/lib/init.d/10_dbus" data = """ +requires_weak 10_net bash /usr/bin/start-dbus.sh """ @@ -46,6 +47,7 @@ dbus-daemon --system [[files]] path = "/usr/lib/init.d/10_xenv" data = """ +requires_weak 10_net glib-compile-schemas /usr/share/glib-2.0/schemas/ """ @@ -53,6 +55,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ [[files]] path = "/usr/lib/init.d/20_orbital" data = """ +requires_weak 10_dbus 10_xenv notify audiod nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-x11 """ @@ -120,6 +123,7 @@ mate-session& [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 20_orbital nowait DISPLAY=:0 getty 2 nowait DISPLAY=:0 getty /scheme/debug/no-preserve -J """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 6ccd5b0c..6fca0f18 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -17,6 +17,7 @@ include = ["../desktop.toml"] [[files]] path = "/usr/lib/init.d/20_orbital" data = """ +requires_weak 10_net notify audiod nowait VT=3 orbital contain_orblogin launcher """ @@ -25,6 +26,7 @@ nowait VT=3 orbital contain_orblogin launcher [[files]] path = "/usr/lib/init.d/30_console" data = """ +requires_weak 20_orbital nowait getty --contain 2 nowait getty --contain /scheme/debug/no-preserve -J """ diff --git a/config/x86_64/server-demo.toml b/config/x86_64/server-demo.toml index 32f4c64c..32c5770a 100644 --- a/config/x86_64/server-demo.toml +++ b/config/x86_64/server-demo.toml @@ -38,12 +38,14 @@ website = {} [[files]] path = "/usr/lib/init.d/98_keygen_sh" data = """ +requires_weak 10_net bash /root/keygen.sh """ [[files]] path = "/usr/lib/init.d/99_rustysd" data = """ +requires_weak 98_keygen_sh # Undocumented usage of rsdctl, pointing to notifications dir RSDCTL_ADDR=/var/run/rustysd/control.socket rustysd --conf /etc/rustysd """