From 78490efca3a2854f9ac75f25eb8114432f555f2f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 29 Jul 2020 16:25:59 +0200 Subject: [PATCH] units: upgrade initrd check Conditions to Asserts It's a bug if an initrd unit is run on the host. Hence let's upgrade the conditions to asserts. --- units/initrd-cleanup.service | 2 +- units/initrd-fs.target | 2 +- units/initrd-parse-etc.service | 2 +- units/initrd-root-device.target | 2 +- units/initrd-root-fs.target | 2 +- units/initrd-switch-root.service | 2 +- units/initrd-switch-root.target | 2 +- units/initrd-udevadm-cleanup-db.service | 2 +- units/initrd.target | 2 +- units/systemd-hibernate-resume@.service.in | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service index b0460767150..1120ef3effe 100644 --- a/units/initrd-cleanup.service +++ b/units/initrd-cleanup.service @@ -10,7 +10,7 @@ [Unit] Description=Cleaning Up and Shutting Down Daemons DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release OnFailure=emergency.target OnFailureJobMode=replace-irreversibly After=initrd-root-fs.target initrd-fs.target initrd.target diff --git a/units/initrd-fs.target b/units/initrd-fs.target index 33822bde66b..49577c364f3 100644 --- a/units/initrd-fs.target +++ b/units/initrd-fs.target @@ -12,7 +12,7 @@ Description=Initrd File Systems Documentation=man:systemd.special(7) OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release After=initrd-parse-etc.service DefaultDependencies=no Conflicts=shutdown.target diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service index b0e38368cfb..94a9719b502 100644 --- a/units/initrd-parse-etc.service +++ b/units/initrd-parse-etc.service @@ -14,7 +14,7 @@ Requires=initrd-root-fs.target After=initrd-root-fs.target OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release [Service] Type=oneshot diff --git a/units/initrd-root-device.target b/units/initrd-root-device.target index 580c666b231..bcb69093203 100644 --- a/units/initrd-root-device.target +++ b/units/initrd-root-device.target @@ -10,7 +10,7 @@ [Unit] Description=Initrd Root Device Documentation=man:systemd.special(7) -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release OnFailure=emergency.target OnFailureJobMode=replace-irreversibly DefaultDependencies=no diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target index 9b955f618a5..f5a8855b6c6 100644 --- a/units/initrd-root-fs.target +++ b/units/initrd-root-fs.target @@ -10,7 +10,7 @@ [Unit] Description=Initrd Root File System Documentation=man:systemd.special(7) -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release OnFailure=emergency.target OnFailureJobMode=replace-irreversibly DefaultDependencies=no diff --git a/units/initrd-switch-root.service b/units/initrd-switch-root.service index c1a37928880..682b8af875b 100644 --- a/units/initrd-switch-root.service +++ b/units/initrd-switch-root.service @@ -10,7 +10,7 @@ [Unit] Description=Switch Root DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release OnFailure=emergency.target OnFailureJobMode=replace-irreversibly AllowIsolate=yes diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target index ea4f02618f1..2723b5af7f0 100644 --- a/units/initrd-switch-root.target +++ b/units/initrd-switch-root.target @@ -9,7 +9,7 @@ [Unit] Description=Switch Root -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release DefaultDependencies=no Requires=initrd-switch-root.service Before=initrd-switch-root.service diff --git a/units/initrd-udevadm-cleanup-db.service b/units/initrd-udevadm-cleanup-db.service index 810cf5775e4..0d66080de73 100644 --- a/units/initrd-udevadm-cleanup-db.service +++ b/units/initrd-udevadm-cleanup-db.service @@ -10,7 +10,7 @@ [Unit] Description=Cleanup udev Database DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service Before=initrd-switch-root.target diff --git a/units/initrd.target b/units/initrd.target index a74a447c91e..bfd497ecc30 100644 --- a/units/initrd.target +++ b/units/initrd.target @@ -12,7 +12,7 @@ Description=Initrd Default Target Documentation=man:systemd.special(7) OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release Requires=basic.target Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service After=initrd-root-fs.target initrd-root-device.target initrd-fs.target basic.target rescue.service rescue.target diff --git a/units/systemd-hibernate-resume@.service.in b/units/systemd-hibernate-resume@.service.in index d1b1aeeabb2..a2db06b031d 100644 --- a/units/systemd-hibernate-resume@.service.in +++ b/units/systemd-hibernate-resume@.service.in @@ -15,7 +15,7 @@ BindsTo=%i.device Wants=local-fs-pre.target After=%i.device Before=local-fs-pre.target -ConditionPathExists=/etc/initrd-release +AssertPathExists=/etc/initrd-release [Service] Type=oneshot -- 2.47.3