mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-22 21:04:18 +08:00
Merge branch 'nowait_orbital' into 'master'
Use nowait for a bunch of daemons See merge request redox-os/redox!1724
This commit is contained in:
commit
6d88695a22
@ -29,7 +29,7 @@ mkdir -m a=rwxt /tmp
|
||||
|
||||
ipcd
|
||||
ptyd
|
||||
sudo --daemon
|
||||
nowait sudo --daemon
|
||||
"""
|
||||
|
||||
[[files]]
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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
|
||||
"""
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -13,7 +13,7 @@ netutils = {}
|
||||
path = "/usr/lib/init.d/10_net"
|
||||
data = """
|
||||
smolnetd
|
||||
dhcpd -b
|
||||
nowait dhcpd
|
||||
"""
|
||||
|
||||
## Default net configuration (optimized for QEMU)
|
||||
|
||||
@ -14,6 +14,6 @@ data = """
|
||||
echo
|
||||
echo ## running redoxer in orbital ##
|
||||
export VT 3
|
||||
orbital redoxerd
|
||||
nowait orbital redoxerd
|
||||
unset VT
|
||||
"""
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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]]
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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
|
||||
"""
|
||||
|
||||
@ -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]]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user