mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
units: add ordering dependencies on initrd-switch-root.target
For shutdown, we queue shutdown.target/start, so in every unit which should be
stopped *before* shutdown, we need both Conflicts and an ordering dependency
with shutdown.target (either Before= or After= would work, because stop jobs
are always ordered before start jobs).
For initrd transition, we queue initrd-switch-root.service/isolate. This
automatically creates a /stop job for every running unit without
IgnoreOnIsolate. But no ordering dependency is created, unless the unit has a
(possibly transitive) ordering dependency on initrd-switch-root.service.
Since most units must stop before the transition, we should add the ordering
dependency. It is nicer to use Before=initrd-switch-root.target for this.
initrd-switch-root.target is ordered before initrd-switch-root.service, so
the effect it the same when both are in a transaction.
Fixes #23745.
To also cover the case where somebody is emergency mode in the initrd and
queues initrd-switch-root.service/start (not isolate), also add
Conflicts=initrd-switch-root.target, so various units are stopped properly.
This extends 2525682565
to cover all the other
services that are touched. It could be consider "operator error", but it's
easy to make and it's nicer if we can make this more foolproof.
This commit is contained in:
parent
d5fd07cdee
commit
7c0e2b5559
@ -17,8 +17,8 @@ ConditionFileNotEmpty=|!/etc/ld.so.cache
|
||||
DefaultDependencies=no
|
||||
After=local-fs.target
|
||||
Before=sysinit.target systemd-update-done.service
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -16,8 +16,8 @@ ConditionPathExists=!/run/plymouth/pid
|
||||
DefaultDependencies=no
|
||||
After=plymouth-start.service systemd-vconsole-setup.service
|
||||
Conflicts=emergency.service
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
ExecStart=systemd-tty-ask-password-agent --watch --console
|
||||
|
@ -12,9 +12,9 @@ Description=Store a System Token in an EFI Variable
|
||||
Documentation=man:systemd-boot-system-token.service(8)
|
||||
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target
|
||||
After=local-fs.target systemd-random-seed.service
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
# Don't run this in a VM environment, because there EFI variables are not
|
||||
# actually stored in NVRAM, independent of regular storage.
|
||||
|
@ -14,8 +14,8 @@ Documentation=man:systemd-network-generator.service(8)
|
||||
DefaultDependencies=no
|
||||
Before=network-pre.target systemd-udevd.service
|
||||
Wants=network-pre.target
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -21,8 +21,8 @@ ConditionDirectoryNotEmpty=|/usr/lib/extensions
|
||||
DefaultDependencies=no
|
||||
After=local-fs.target
|
||||
Before=sysinit.target systemd-tmpfiles.service
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -14,8 +14,8 @@ Documentation=man:sysusers.d(5) man:systemd-sysusers.service(8)
|
||||
DefaultDependencies=no
|
||||
After=systemd-remount-fs.service
|
||||
Before=sysinit.target systemd-update-done.service
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
ConditionNeedsUpdate=|/etc
|
||||
ConditionCredential=|sysusers.extra
|
||||
|
@ -12,9 +12,9 @@ Description=Cleanup of Temporary Directories
|
||||
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||||
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target initrd-switch-root.service
|
||||
After=local-fs.target time-set.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -14,8 +14,8 @@ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||||
DefaultDependencies=no
|
||||
After=systemd-sysusers.service
|
||||
Before=sysinit.target local-fs-pre.target systemd-udevd.service
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -12,10 +12,10 @@ Description=Create Volatile Files and Directories
|
||||
Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
|
||||
|
||||
DefaultDependencies=no
|
||||
Conflicts=shutdown.target initrd-switch-root.service
|
||||
After=local-fs.target systemd-sysusers.service systemd-journald.service
|
||||
Before=sysinit.target
|
||||
Before=shutdown.target
|
||||
Conflicts=shutdown.target initrd-switch-root.target
|
||||
Before=shutdown.target initrd-switch-root.target
|
||||
RefuseManualStop=yes
|
||||
|
||||
[Service]
|
||||
|
Loading…
Reference in New Issue
Block a user