shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-08 09:57:41 +03:00
Code

Revert "units: do not soft-reboot before soft-reboot.target reached"

Browse Source 
This reverts commit 4263d7617f0e6ea741e227db223ac6085479165f.

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.
This commit is contained in:
Yu Watanabe 2024-05-22 23:53:13 +09:00
parent 87ed87efe1
commit 03a41c41ee
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
units/soft-reboot.target
View File

@ -11,10 +11,8 @@
Description=Reboot System Userspace Description=Reboot System Userspace
Documentation=man:systemd.special(7) Documentation=man:systemd.special(7)
DefaultDependencies=no DefaultDependencies=no
Requires=shutdown.target umount.target final.target
After=shutdown.target umount.target final.target
Requires=systemd-soft-reboot.service Requires=systemd-soft-reboot.service
Before=systemd-soft-reboot.service After=systemd-soft-reboot.service
AllowIsolate=yes AllowIsolate=yes
JobTimeoutSec=30min JobTimeoutSec=30min
JobTimeoutAction=soft-reboot-force JobTimeoutAction=soft-reboot-force

3
units/systemd-soft-reboot.service
View File

@ -11,5 +11,6 @@
Description=Reboot System Userspace Description=Reboot System Userspace
Documentation=man:systemd-soft-reboot.service(8) Documentation=man:systemd-soft-reboot.service(8)
DefaultDependencies=no DefaultDependencies=no
Requires=soft-reboot.target Requires=shutdown.target umount.target final.target
After=shutdown.target umount.target final.target
SuccessAction=soft-reboot-force SuccessAction=soft-reboot-force