diff options
| -rw-r--r-- | units/ldconfig.service | 4 | ||||
| -rw-r--r-- | units/systemd-ask-password-console.service | 4 | ||||
| -rw-r--r-- | units/systemd-boot-system-token.service | 4 | ||||
| -rw-r--r-- | units/systemd-network-generator.service.in | 4 | ||||
| -rw-r--r-- | units/systemd-sysext.service | 4 | ||||
| -rw-r--r-- | units/systemd-sysusers.service | 4 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-clean.service | 4 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup-dev.service | 4 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup.service | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/units/ldconfig.service b/units/ldconfig.service index cb887ae865..53c6d4ecb1 100644 --- a/units/ldconfig.service +++ b/units/ldconfig.service @@ -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 diff --git a/units/systemd-ask-password-console.service b/units/systemd-ask-password-console.service index 97c651f009..9360bf1d5a 100644 --- a/units/systemd-ask-password-console.service +++ b/units/systemd-ask-password-console.service @@ -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 diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service index 56d3c8ad47..662a1fda04 100644 --- a/units/systemd-boot-system-token.service +++ b/units/systemd-boot-system-token.service @@ -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. diff --git a/units/systemd-network-generator.service.in b/units/systemd-network-generator.service.in index 41c27c50d8..2b79ca6b8a 100644 --- a/units/systemd-network-generator.service.in +++ b/units/systemd-network-generator.service.in @@ -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 diff --git a/units/systemd-sysext.service b/units/systemd-sysext.service index 245c0e5a0d..254de2b623 100644 --- a/units/systemd-sysext.service +++ b/units/systemd-sysext.service @@ -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 diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service index 8b9335ff28..0eb40294b2 100644 --- a/units/systemd-sysusers.service +++ b/units/systemd-sysusers.service @@ -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 diff --git a/units/systemd-tmpfiles-clean.service b/units/systemd-tmpfiles-clean.service index 7f1b7ec594..4163aef729 100644 --- a/units/systemd-tmpfiles-clean.service +++ b/units/systemd-tmpfiles-clean.service @@ -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 diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service index d202a7568f..c65539aa79 100644 --- a/units/systemd-tmpfiles-setup-dev.service +++ b/units/systemd-tmpfiles-setup-dev.service @@ -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 diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service index baed27df75..7e11eb9414 100644 --- a/units/systemd-tmpfiles-setup.service +++ b/units/systemd-tmpfiles-setup.service @@ -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] |