Skip to content

Commit 447aa43

Browse files
davide125DaanDeMeyer
authored andcommitted
Fix ordering cycle between preset-global.service and basic.target
Adjust the dependencies to avoid it
1 parent 4358a48 commit 447aa43

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

mkosi.extra/usr/lib/systemd/system-preset/10-particleos.preset

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ disable avahi.*
2020

2121
enable pcscd.service
2222
enable power-profiles-daemon.service
23-
24-
# Our own service to run systemctl preset --global.
25-
enable preset-global.service
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
22

33
[Unit]
4-
Before=user.slice
54
ConditionFirstBoot=yes
65
ConditionPathIsReadWrite=/etc
76

7+
DefaultDependencies=no
8+
9+
Before=basic.target
10+
Conflicts=shutdown.target
11+
Before=shutdown.target
12+
813
[Service]
914
Type=oneshot
1015
RemainAfterExit=yes
1116
ExecStart=systemctl preset-all --global
1217

1318
[Install]
14-
WantedBy=multi-user.target
19+
WantedBy=basic.target

0 commit comments

Comments
 (0)