Skip to content

Commit 03a41c4

Browse files
committed
Revert "units: do not soft-reboot before soft-reboot.target reached"
This reverts commit 4263d76. Still I think this is the way to go. But the change was merged after -rc2, and still discussion is continued. So, at least now let's revert it, and do that after v256-final is released if approved.
1 parent 87ed87e commit 03a41c4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

units/soft-reboot.target

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
Description=Reboot System Userspace
1212
Documentation=man:systemd.special(7)
1313
DefaultDependencies=no
14-
Requires=shutdown.target umount.target final.target
15-
After=shutdown.target umount.target final.target
1614
Requires=systemd-soft-reboot.service
17-
Before=systemd-soft-reboot.service
15+
After=systemd-soft-reboot.service
1816
AllowIsolate=yes
1917
JobTimeoutSec=30min
2018
JobTimeoutAction=soft-reboot-force

units/systemd-soft-reboot.service

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
Description=Reboot System Userspace
1212
Documentation=man:systemd-soft-reboot.service(8)
1313
DefaultDependencies=no
14-
Requires=soft-reboot.target
14+
Requires=shutdown.target umount.target final.target
15+
After=shutdown.target umount.target final.target
1516
SuccessAction=soft-reboot-force

0 commit comments

Comments
 (0)