summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-07-29 16:25:59 +0200
committerLennart Poettering <lennart@poettering.net>2020-07-29 16:32:03 +0200
commit78490efca3a2854f9ac75f25eb8114432f555f2f (patch)
treee7ce3426875129742e2868ec6d9f7edb7fa3019e /units
parent0cfb490fe9e3af39f7d7f9431b9fee9b5c98b992 (diff)
downloadsystemd-78490efca3a2854f9ac75f25eb8114432f555f2f.tar.gz
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.
Diffstat (limited to 'units')
-rw-r--r--units/initrd-cleanup.service2
-rw-r--r--units/initrd-fs.target2
-rw-r--r--units/initrd-parse-etc.service2
-rw-r--r--units/initrd-root-device.target2
-rw-r--r--units/initrd-root-fs.target2
-rw-r--r--units/initrd-switch-root.service2
-rw-r--r--units/initrd-switch-root.target2
-rw-r--r--units/initrd-udevadm-cleanup-db.service2
-rw-r--r--units/initrd.target2
-rw-r--r--units/systemd-hibernate-resume@.service.in2
10 files changed, 10 insertions, 10 deletions
diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index b046076715..1120ef3eff 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 33822bde66..49577c364f 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 b0e38368cf..94a9719b50 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 580c666b23..bcb6909320 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 9b955f618a..f5a8855b6c 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 c1a3792888..682b8af875 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 ea4f02618f..2723b5af7f 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 810cf5775e..0d66080de7 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 a74a447c91..bfd497ecc3 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 d1b1aeeabb..a2db06b031 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