From e3ee5d410c01af118004ca61d54747d2f16fc1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=AA=E5=BC=82=E8=BD=AF=E7=B3=96?= <219617512+WeirdGumi@users.noreply.github.com> Date: Wed, 18 Mar 2026 02:24:21 +0800 Subject: [PATCH] Migrate to new dinit service syntax Link: https://github.com/eweOS/packages/issues/6141 --- services/boot | 4 ++-- services/early-cgroups | 4 ++-- services/early-devices.target | 2 +- services/early-env | 2 +- services/early-fs-fstab.target | 4 ++-- services/early-fs-pre.target | 2 +- services/early-fs.target | 4 ++-- services/early-hostname | 2 +- services/early-machine-id | 2 +- services/early-modules | 2 +- services/early-modules-early | 2 +- services/early-modules.target | 2 +- services/early-net-lo | 2 +- services/early-pre.target | 6 +++--- services/early-pseudofs | 2 +- services/early-root-fsck | 4 ++-- services/early-root-rw.target | 4 ++-- services/early-swap | 2 +- services/early-sysctl | 4 ++-- services/early-sysutils | 10 +++++----- services/early.target | 4 ++-- services/login.target | 4 ++-- services/network.target | 2 +- services/pre-network.target | 2 +- services/rc.target | 2 +- services/recovery | 2 +- services/single | 2 +- services/system | 6 +++--- services/time-sync.target | 2 +- user-services/boot | 2 +- 30 files changed, 47 insertions(+), 47 deletions(-) diff --git a/services/boot b/services/boot index 38c2fd8..dbec38e 100644 --- a/services/boot +++ b/services/boot @@ -1,3 +1,3 @@ type = internal -depends-ms = system -waits-for.d = /etc/dinit.d/boot.d +depends-ms: system +waits-for.d: /etc/dinit.d/boot.d diff --git a/services/early-cgroups b/services/early-cgroups index 1949074..60fdf57 100644 --- a/services/early-cgroups +++ b/services/early-cgroups @@ -1,5 +1,5 @@ type = scripted command = /usr/lib/dinit/exec/early/cgroups -depends-on = early-env -depends-on = early-pseudofs +depends-on: early-env +depends-on: early-pseudofs diff --git a/services/early-devices.target b/services/early-devices.target index d49df39..2a88d86 100644 --- a/services/early-devices.target +++ b/services/early-devices.target @@ -1,2 +1,2 @@ type = internal -depends-on = mdev +depends-on: mdev diff --git a/services/early-env b/services/early-env index 05520ae..baf4958 100644 --- a/services/early-env +++ b/services/early-env @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/env -options = pass-cs-fd +options: pass-cs-fd diff --git a/services/early-fs-fstab.target b/services/early-fs-fstab.target index ae643dc..25ee624 100644 --- a/services/early-fs-fstab.target +++ b/services/early-fs-fstab.target @@ -1,4 +1,4 @@ type = scripted command = /usr/lib/dinit/exec/early/fs-fstab start -depends-on = early-devices.target -waits-for = early-root-rw.target +depends-on: early-devices.target +waits-for: early-root-rw.target diff --git a/services/early-fs-pre.target b/services/early-fs-pre.target index 32d4e89..d91ade3 100644 --- a/services/early-fs-pre.target +++ b/services/early-fs-pre.target @@ -1,2 +1,2 @@ type = internal -depends-on = early-devices.target +depends-on: early-devices.target diff --git a/services/early-fs.target b/services/early-fs.target index 382b2d6..c2a7703 100644 --- a/services/early-fs.target +++ b/services/early-fs.target @@ -1,3 +1,3 @@ type = internal -depends-on = early-fs-pre.target -waits-for.d = /usr/lib/dinit.d/early-fs.waits-for.d +depends-on: early-fs-pre.target +waits-for.d: /usr/lib/dinit.d/early-fs.waits-for.d diff --git a/services/early-hostname b/services/early-hostname index fec4400..d292c14 100644 --- a/services/early-hostname +++ b/services/early-hostname @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/set-hostname -depends-on = early-devices.target +depends-on: early-devices.target diff --git a/services/early-machine-id b/services/early-machine-id index 022348a..3bc22b3 100644 --- a/services/early-machine-id +++ b/services/early-machine-id @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/machine-id -waits-for = early-root-rw.target +waits-for: early-root-rw.target diff --git a/services/early-modules b/services/early-modules index 78ecae3..f33a443 100644 --- a/services/early-modules +++ b/services/early-modules @@ -1,4 +1,4 @@ type = scripted command = /usr/lib/dinit/exec/early/modules -depends-ms = early-modules-early +depends-ms: early-modules-early diff --git a/services/early-modules-early b/services/early-modules-early index 4050972..bceda68 100644 --- a/services/early-modules-early +++ b/services/early-modules-early @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/modules-early -depends-on = early-pre.target +depends-on: early-pre.target diff --git a/services/early-modules.target b/services/early-modules.target index 739b86d..a95ed45 100644 --- a/services/early-modules.target +++ b/services/early-modules.target @@ -1,2 +1,2 @@ type = internal -depends-ms = early-modules +depends-ms: early-modules diff --git a/services/early-net-lo b/services/early-net-lo index d6b2c13..7858588 100644 --- a/services/early-net-lo +++ b/services/early-net-lo @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/net-lo -depends-on = early-devices.target +depends-on: early-devices.target diff --git a/services/early-pre.target b/services/early-pre.target index 0792fc4..2f35365 100644 --- a/services/early-pre.target +++ b/services/early-pre.target @@ -1,4 +1,4 @@ type = internal -depends-on = early-env -depends-on = early-pseudofs -depends-on = early-cgroups +depends-on: early-env +depends-on: early-pseudofs +depends-on: early-cgroups diff --git a/services/early-pseudofs b/services/early-pseudofs index 406b7f1..a444615 100644 --- a/services/early-pseudofs +++ b/services/early-pseudofs @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/early/pseudofs -depends-on = early-env +depends-on: early-env diff --git a/services/early-root-fsck b/services/early-root-fsck index 952b18e..9d37b5d 100644 --- a/services/early-root-fsck +++ b/services/early-root-fsck @@ -1,7 +1,7 @@ type = scripted command = /usr/lib/dinit/exec/early/root-fsck start-timeout = 0 -depends-on = early-pre.target -depends-ms = early-devices.target +depends-on: early-pre.target +depends-ms: early-devices.target restart = false options = starts-on-console pass-cs-fd start-interruptible skippable diff --git a/services/early-root-rw.target b/services/early-root-rw.target index 6f3cb70..8142cb3 100644 --- a/services/early-root-rw.target +++ b/services/early-root-rw.target @@ -1,4 +1,4 @@ type = scripted command = /usr/lib/dinit/exec/early/set-rootrw -depends-ms = early-root-fsck -options = starts-rwfs +depends-ms: early-root-fsck +options: starts-rwfs diff --git a/services/early-swap b/services/early-swap index b5e02c9..50e338f 100644 --- a/services/early-swap +++ b/services/early-swap @@ -1,3 +1,3 @@ type = scripted command = /usr/bin/swapon -a -depends-on = early-fs.target +depends-on: early-fs.target diff --git a/services/early-sysctl b/services/early-sysctl index d5ce6bb..990a0c5 100644 --- a/services/early-sysctl +++ b/services/early-sysctl @@ -1,4 +1,4 @@ type = scripted command = /usr/lib/dinit/exec/early/sysctl -depends-on = early-devices.target -depends-on = early-fs.target +depends-on: early-devices.target +depends-on: early-fs.target diff --git a/services/early-sysutils b/services/early-sysutils index 18e1d80..53d7d06 100644 --- a/services/early-sysutils +++ b/services/early-sysutils @@ -1,6 +1,6 @@ type = internal -depends-on = catnest -depends-on = pawprint -depends-on = syslogd -depends-on = utmpd -depends-on = wtmpd +depends-on: catnest +depends-on: pawprint +depends-on: syslogd +depends-on: utmpd +depends-on: wtmpd diff --git a/services/early.target b/services/early.target index 7fb23e9..db62730 100644 --- a/services/early.target +++ b/services/early.target @@ -1,3 +1,3 @@ type = internal -waits-for.d = /usr/lib/dinit.d/early.waits-for.d -depends-on.d = /usr/lib/dinit.d/early.depends-on.d +waits-for.d: /usr/lib/dinit.d/early.waits-for.d +depends-on.d: /usr/lib/dinit.d/early.depends-on.d diff --git a/services/login.target b/services/login.target index d8aa5fc..45b6c4f 100644 --- a/services/login.target +++ b/services/login.target @@ -1,3 +1,3 @@ type = internal -depends-on = rc.target -options = runs-on-console +depends-on: rc.target +options: runs-on-console diff --git a/services/network.target b/services/network.target index d04b22b..8c16130 100644 --- a/services/network.target +++ b/services/network.target @@ -1,2 +1,2 @@ type = internal -depends-on = pre-network.target +depends-on: pre-network.target diff --git a/services/pre-network.target b/services/pre-network.target index 73c6212..4193efa 100644 --- a/services/pre-network.target +++ b/services/pre-network.target @@ -1,2 +1,2 @@ type = internal -depends-on = rc.target +depends-on: rc.target diff --git a/services/rc.target b/services/rc.target index adc6d86..1cf9628 100644 --- a/services/rc.target +++ b/services/rc.target @@ -1,3 +1,3 @@ type = scripted command = /usr/lib/dinit/exec/rc -depends-on = early.target +depends-on: early.target diff --git a/services/recovery b/services/recovery index a6d978c..e004c87 100644 --- a/services/recovery +++ b/services/recovery @@ -1,4 +1,4 @@ type = process command = /usr/lib/dinit/exec/early/sulogin restart = false -options = runs-on-console +options: runs-on-console diff --git a/services/single b/services/single index 1055372..52aa877 100644 --- a/services/single +++ b/services/single @@ -1,5 +1,5 @@ type = process command = /usr/lib/dinit/exec/early/sulogin restart = false -options = shares-console +options: shares-console chain-to = boot diff --git a/services/system b/services/system index 9b4748f..82f4a3a 100644 --- a/services/system +++ b/services/system @@ -1,4 +1,4 @@ type = internal -depends-on = login.target -depends-on = network.target -waits-for.d = /usr/lib/dinit.d/boot.d +depends-on: login.target +depends-on: network.target +waits-for.d: /usr/lib/dinit.d/boot.d diff --git a/services/time-sync.target b/services/time-sync.target index 73c6212..4193efa 100644 --- a/services/time-sync.target +++ b/services/time-sync.target @@ -1,2 +1,2 @@ type = internal -depends-on = rc.target +depends-on: rc.target diff --git a/user-services/boot b/user-services/boot index f5372f4..acd9662 100644 --- a/user-services/boot +++ b/user-services/boot @@ -1,2 +1,2 @@ type = internal -waits-for.d = boot.d +waits-for.d: boot.d