dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-24 08:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32880 from yuwata/unit-soft-reboot

Browse Source 
units: do not soft-reboot before soft-reboot.target reached
This commit is contained in:
Mike Yuan
2024-05-17 14:06:44 +08:00
committed by GitHub
parent c22a112883 4263d7617f
commit bf71770960
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
units/soft-reboot.target
View File

@@ -11,8 +11,10 @@
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
After=systemd-soft-reboot.service
Before=systemd-soft-reboot.service
AllowIsolate=yes
JobTimeoutSec=30min
JobTimeoutAction=soft-reboot-force

5
units/systemd-journald@.service.in
View File

@@ -13,11 +13,6 @@ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
Requires=systemd-journald@%i.socket systemd-journald-varlink@%i.socket
After=systemd-journald@%i.socket systemd-journald-varlink@%i.socket
# To avoid journald SIGKILLed during soft-reboot and corrupting journals.
# See https://github.com/systemd/systemd/issues/30195
Before=soft-reboot.target
Conflicts=soft-reboot.target
[Service]
CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
DevicePolicy=closed

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

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