diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-05-22 16:53:13 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-05-22 17:06:30 +0200 |
| commit | 03a41c41eedf6e45c312b3fcc6f5822e0aa43871 (patch) | |
| tree | 689531a49f56f09b233f9f70eb9810dd20cf8be7 | |
| parent | test: also flush and rotate journal before read (diff) | |
| download | systemd-03a41c41eedf6e45c312b3fcc6f5822e0aa43871.tar.xz systemd-03a41c41eedf6e45c312b3fcc6f5822e0aa43871.zip | |
Revert "units: do not soft-reboot before soft-reboot.target reached"
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.
| -rw-r--r-- | units/soft-reboot.target | 4 | ||||
| -rw-r--r-- | units/systemd-soft-reboot.service | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/units/soft-reboot.target b/units/soft-reboot.target index 4bca192454..6a6c772875 100644 --- a/units/soft-reboot.target +++ b/units/soft-reboot.target @@ -11,10 +11,8 @@ Description=Reboot System Userspace Documentation=man:systemd.special(7) DefaultDependencies=no -Requires=shutdown.target umount.target final.target -After=shutdown.target umount.target final.target Requires=systemd-soft-reboot.service -Before=systemd-soft-reboot.service +After=systemd-soft-reboot.service AllowIsolate=yes JobTimeoutSec=30min JobTimeoutAction=soft-reboot-force diff --git a/units/systemd-soft-reboot.service b/units/systemd-soft-reboot.service index da9f463821..35ba3a9fc4 100644 --- a/units/systemd-soft-reboot.service +++ b/units/systemd-soft-reboot.service @@ -11,5 +11,6 @@ Description=Reboot System Userspace Documentation=man:systemd-soft-reboot.service(8) DefaultDependencies=no -Requires=soft-reboot.target +Requires=shutdown.target umount.target final.target +After=shutdown.target umount.target final.target SuccessAction=soft-reboot-force |