From d0d00fc2397670989ad3c17e7d80639e5653376d Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 30 Nov 2025 10:03:36 +0100 Subject: [PATCH 1/2] Use nowait for orbital This way orbital no longer needs to daemonize itself. --- config/desktop-minimal.toml | 2 +- config/desktop.toml | 2 +- config/redoxer-gui.toml | 2 +- config/wayland.toml | 11 +++++++++-- config/x11.toml | 2 +- config/x86_64/desktop-contain.toml | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml index 7394cce3f..89e40dda9 100644 --- a/config/desktop-minimal.toml +++ b/config/desktop-minimal.toml @@ -20,7 +20,7 @@ orbutils-orblogin = {} path = "/usr/lib/init.d/20_orbital" data = """ export VT 3 -orbital orblogin launcher +nowait orbital orblogin launcher unset VT """ diff --git a/config/desktop.toml b/config/desktop.toml index 7e729da40..9928ccb7f 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -32,7 +32,7 @@ data = """ audiod export BROWSER /bin/netsurf-fb export VT 3 -orbital orblogin launcher +nowait orbital orblogin launcher unset BROWSER unset VT """ diff --git a/config/redoxer-gui.toml b/config/redoxer-gui.toml index 04fd23f00..fd32620f2 100644 --- a/config/redoxer-gui.toml +++ b/config/redoxer-gui.toml @@ -14,6 +14,6 @@ data = """ echo echo ## running redoxer in orbital ## export VT 3 -orbital redoxerd +nowait orbital redoxerd unset VT """ diff --git a/config/wayland.toml b/config/wayland.toml index 15dce7d01..f39d4c5ab 100644 --- a/config/wayland.toml +++ b/config/wayland.toml @@ -12,6 +12,7 @@ filesystem_size = 2048 # Package settings [packages] adwaita-icon-theme = {} +bash = {} gtk3 = {} libxcursor = {} mesa = {} @@ -31,10 +32,16 @@ export WAYLAND_DISPLAY wayland-1 glib-compile-schemas /usr/share/glib-2.0/schemas/ """ +# Overridden to launch smallvil instead of orblogin [[files]] -path = "/usr/lib/init.d/40_wayland" +path = "/usr/lib/init.d/20_orbital" data = """ -orbital-wayland +audiod +export BROWSER /bin/netsurf-fb +export VT 3 +nowait orbital orbital-wayland +unset BROWSER +unset VT """ [[files]] diff --git a/config/x11.toml b/config/x11.toml index 03e64523c..d2ff5cd2d 100644 --- a/config/x11.toml +++ b/config/x11.toml @@ -63,7 +63,7 @@ data = """ audiod export BROWSER /bin/netsurf-fb export VT 3 -orbital orbital-x11 +nowait orbital orbital-x11 unset BROWSER unset VT """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 2200f92d5..7dbbb006a 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -19,7 +19,7 @@ path = "/usr/lib/init.d/20_orbital" data = """ audiod export VT 3 -orbital contain_orblogin launcher +nowait orbital contain_orblogin launcher unset VT """ From 56967cc5ce756d30990c0c312881bb0c92a3dbb2 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 30 Nov 2025 11:20:11 +0100 Subject: [PATCH 2/2] Use nowait for sudo, getty and dhcpd --- config/base.toml | 2 +- config/desktop-minimal.toml | 4 ++-- config/desktop.toml | 4 ++-- config/minimal-net.toml | 4 ++-- config/minimal.toml | 4 ++-- config/net.toml | 2 +- config/server.toml | 4 ++-- config/x86_64/desktop-contain.toml | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/base.toml b/config/base.toml index 96b645166..6fec395c0 100644 --- a/config/base.toml +++ b/config/base.toml @@ -29,7 +29,7 @@ mkdir -m a=rwxt /tmp ipcd ptyd -sudo --daemon +nowait sudo --daemon """ [[files]] diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml index 89e40dda9..9231975db 100644 --- a/config/desktop-minimal.toml +++ b/config/desktop-minimal.toml @@ -28,6 +28,6 @@ unset VT [[files]] path = "/usr/lib/init.d/30_console" data = """ -getty 2 -getty /scheme/debug/no-preserve -J +nowait getty 2 +nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/desktop.toml b/config/desktop.toml index 9928ccb7f..3c7bd1411 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -41,6 +41,6 @@ unset VT [[files]] path = "/usr/lib/init.d/30_console" data = """ -getty 2 -getty /scheme/debug/no-preserve -J +nowait getty 2 +nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/minimal-net.toml b/config/minimal-net.toml index 741f6c782..4c81b43cd 100644 --- a/config/minimal-net.toml +++ b/config/minimal-net.toml @@ -22,7 +22,7 @@ kibi = {} path = "/usr/lib/init.d/30_console" data = """ inputd -A 2 -getty 2 -getty /scheme/debug -J +nowait getty 2 +nowait getty /scheme/debug -J """ diff --git a/config/minimal.toml b/config/minimal.toml index ec4a1e83f..571e36138 100644 --- a/config/minimal.toml +++ b/config/minimal.toml @@ -18,6 +18,6 @@ kibi = {} path = "/usr/lib/init.d/30_console" data = """ inputd -A 2 -getty 2 -getty /scheme/debug/no-preserve -J +nowait getty 2 +nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/net.toml b/config/net.toml index e29d4f83e..05f6f5a40 100644 --- a/config/net.toml +++ b/config/net.toml @@ -13,7 +13,7 @@ netutils = {} path = "/usr/lib/init.d/10_net" data = """ smolnetd -dhcpd -b +nowait dhcpd """ ## Default net configuration (optimized for QEMU) diff --git a/config/server.toml b/config/server.toml index b85a79062..5e985216e 100644 --- a/config/server.toml +++ b/config/server.toml @@ -29,6 +29,6 @@ redoxfs = {} path = "/usr/lib/init.d/30_console" data = """ inputd -A 2 -getty 2 -getty /scheme/debug/no-preserve -J +nowait getty 2 +nowait getty /scheme/debug/no-preserve -J """ diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 7dbbb006a..9aea34b7f 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -27,8 +27,8 @@ unset VT [[files]] path = "/usr/lib/init.d/30_console" data = """ -getty --contain 2 -getty --contain /scheme/debug/no-preserve -J +nowait getty --contain 2 +nowait getty --contain /scheme/debug/no-preserve -J """ [[files]]