From 31489ce7cadcead5acd0edd87b9fcfc0e12a12dd Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:03:41 +0100 Subject: [PATCH] init: Convert inputd and lived to services --- init.d/10_inputd.service | 11 +++++++++++ init.d/10_lived.service | 10 ++++++++++ init.d/20_graphics | 4 +--- init.d/30_live | 3 --- init.d/40_drivers | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 init.d/10_inputd.service create mode 100644 init.d/10_lived.service delete mode 100644 init.d/30_live diff --git a/init.d/10_inputd.service b/init.d/10_inputd.service new file mode 100644 index 0000000000..96e7f1e0a6 --- /dev/null +++ b/init.d/10_inputd.service @@ -0,0 +1,11 @@ +{ + "unit": { + "description": "VT input and graphics multiplexer" + }, + "service": { + "cmd": "inputd", + "type": { + "scheme": "input" + } + } +} diff --git a/init.d/10_lived.service b/init.d/10_lived.service new file mode 100644 index 0000000000..baec5da7c0 --- /dev/null +++ b/init.d/10_lived.service @@ -0,0 +1,10 @@ +{ + "_comment": "Needs to start before drivers to ensure it gets priority when redoxfs searches for disks", + "unit": { + "description": "Live disk" + }, + "service": { + "cmd": "lived", + "type": "notify" + } +} diff --git a/init.d/20_graphics b/init.d/20_graphics index ecfd423b4c..3cf2decf32 100644 --- a/init.d/20_graphics +++ b/init.d/20_graphics @@ -1,6 +1,4 @@ -scheme input inputd +requires_weak 10_inputd.service notify FRAMEBUFFER_ADDR=$ FRAMEBUFFER_VIRT=$ FRAMEBUFFER_WIDTH=$ FRAMEBUFFER_HEIGHT=$ FRAMEBUFFER_STRIDE=$ vesad scheme fbbootlog fbbootlogd -# Activate framebuffer log VT, which disables kernel graphical debug -inputd -A 1 scheme fbcon fbcond 2 diff --git a/init.d/30_live b/init.d/30_live deleted file mode 100644 index 68020e9f76..0000000000 --- a/init.d/30_live +++ /dev/null @@ -1,3 +0,0 @@ -requires_weak 20_graphics -# Note: Needs to start before drivers to ensure it gets priority when redoxfs searches for disks -notify lived diff --git a/init.d/40_drivers b/init.d/40_drivers index 8ee66e2da5..b23ea0d14c 100644 --- a/init.d/40_drivers +++ b/init.d/40_drivers @@ -1,4 +1,4 @@ -requires_weak 30_live +requires_weak 10_lived.service 20_graphics notify ps2d notify RSDP_ADDR=$ RSDP_SIZE=$ hwd pcid-spawner --initfs