--- units/initrd-cleanup.service.in | 2 +- units/initrd-fs.target | 2 +- units/initrd-parse-etc.service.in | 2 +- units/initrd-root-fs.target | 2 +- units/initrd-switch-root.service.in | 2 +- units/initrd-switch-root.target | 2 +- units/initrd-udevadm-cleanup-db.service.in | 2 +- units/initrd.target | 2 +- units/systemd-hibernate-res...@.service.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/units/initrd-cleanup.service.in b/units/initrd-cleanup.service.in index b1dda16..833c59d 100644 --- a/units/initrd-cleanup.service.in +++ b/units/initrd-cleanup.service.in @@ -8,7 +8,7 @@ [Unit] Description=Cleaning Up and Shutting Down Daemons DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true 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 7ec838a..a02a3b4 100644 --- a/units/initrd-fs.target +++ b/units/initrd-fs.target @@ -10,7 +10,7 @@ Description=Initrd File Systems Documentation=man:systemd.special(7) OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true After=initrd-parse-etc.service DefaultDependencies=no Conflicts=shutdown.target diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in index c0b2543..22fe8cc 100644 --- a/units/initrd-parse-etc.service.in +++ b/units/initrd-parse-etc.service.in @@ -12,7 +12,7 @@ Requires=initrd-root-fs.target After=initrd-root-fs.target OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true [Service] Type=oneshot diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target index 64f0a92..cabba13 100644 --- a/units/initrd-root-fs.target +++ b/units/initrd-root-fs.target @@ -8,7 +8,7 @@ [Unit] Description=Initrd Root File System Documentation=man:systemd.special(7) -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true OnFailure=emergency.target OnFailureJobMode=replace-irreversibly DefaultDependencies=no diff --git a/units/initrd-switch-root.service.in b/units/initrd-switch-root.service.in index 82893da..b4475aa 100644 --- a/units/initrd-switch-root.service.in +++ b/units/initrd-switch-root.service.in @@ -8,7 +8,7 @@ [Unit] Description=Switch Root DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true OnFailure=emergency.target OnFailureJobMode=replace-irreversibly AllowIsolate=yes diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target index f347687..fbee5c2 100644 --- a/units/initrd-switch-root.target +++ b/units/initrd-switch-root.target @@ -7,7 +7,7 @@ [Unit] Description=Switch Root -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true DefaultDependencies=no Requires=initrd-switch-root.service Before=initrd-switch-root.service diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service.in index 5c6654e..6b97425 100644 --- a/units/initrd-udevadm-cleanup-db.service.in +++ b/units/initrd-udevadm-cleanup-db.service.in @@ -8,7 +8,7 @@ [Unit] Description=Cleanup udevd DB DefaultDependencies=no -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket Before=initrd-switch-root.target diff --git a/units/initrd.target b/units/initrd.target index eae7c70..81af69e 100644 --- a/units/initrd.target +++ b/units/initrd.target @@ -10,7 +10,7 @@ Description=Initrd Default Target Documentation=man:systemd.special(7) OnFailure=emergency.target OnFailureJobMode=replace-irreversibly -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true Requires=basic.target Wants=initrd-root-fs.target initrd-fs.target initrd-parse-etc.service After=initrd-root-fs.target initrd-fs.target basic.target rescue.service rescue.target diff --git a/units/systemd-hibernate-res...@.service.in b/units/systemd-hibernate-res...@.service.in index 6db584d..3e8c2ef 100644 --- a/units/systemd-hibernate-res...@.service.in +++ b/units/systemd-hibernate-res...@.service.in @@ -13,7 +13,7 @@ BindsTo=%i.device Wants=local-fs-pre.target After=%i.device Before=local-fs-pre.target systemd-remount-fs.service systemd-fsck-root.service -ConditionPathExists=/etc/initrd-release +ConditionInitrd=true [Service] Type=oneshot -- 2.1.0 _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
