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.

diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index b04607671503fcf043c11ba32c9daffe971de330..1120ef3effeaaffb328ca3010eaab5e3728e6d5e 100644 (file)
--- 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 33822bde66b9ec3e761046f4512a5c589e6a473c..49577c364f3a8f30c270c68aee3170d35152d5bd 100644 (file)
--- 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 b0e38368cfbd3782d861675c8b97a707c68c3850..94a9719b502c3500d0191d5dae413669508c6cd4 100644 (file)
--- 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 580c666b2310fcde64ac3a9d5c234e1f978c6fb0..bcb69093203d0e6013fcb444f969d98b6aba0dfc 100644 (file)
--- 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 9b955f618a5fb080c73e2c989958988c97a6d8e1..f5a8855b6c6a848e4be3fc3fb97d7b5ac97d54c1 100644 (file)
--- 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 c1a37928880535435318a74e982ec76f8e385bd6..682b8af875b805806bd5696b34e1fedce2f0de77 100644 (file)
--- 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 ea4f02618f1c175460cf3d78a4fd5a6994790505..2723b5af7f01d3e6bf39fe07ead47a1c4f87a4f5 100644 (file)
--- 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 810cf5775e497e6d03df5909c5718c09669f5ea2..0d66080de73d1a63255eac62e78e3a9097d5266f 100644 (file)
--- 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 a74a447c91ec0ce530c9dae61b9e59f54a862720..bfd497ecc3099b0edb919774fd0ba4d72cbc4912 100644 (file)
--- 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 d1b1aeeabb22d8fb46197703a1967db114579846..a2db06b031dfefbb68f2ef7d1017c6c643650a47 100644 (file)
--- 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