Revert "units: drop OnFailure= from .target units"

This reverts commit c7220ca8025e8dbded36131b23a502d975c45754.

The removal was done as a reaction to the messages from systemd:
initrd-root-fs.target: Requested dependency OnFailure=emergency.target ignored (target units cannot fail).
initrd.target: Requested dependency OnFailure=emergency.target ignored (target units cannot fail).
initrd-root-device.target: Requested dependency OnFailure=emergency.target ignored (target units cannot fail).
initrd-fs.target: Requested dependency OnFailure=emergency.target ignored (target units cannot fail).
local-fs.target: Requested dependency OnFailure=emergency.target ignored (target units cannot fail).
...
But it seems that the messages themselves are wrong, and the units were OK.

diff --git a/units/initrd-fs.target b/units/initrd-fs.target
index 1db8fb3a48d59d1684df3eb024aef1da6148d02f..33822bde66b9ec3e761046f4512a5c589e6a473c 100644 (file)
--- a/units/initrd-fs.target
+++ b/units/initrd-fs.target
@@ -10,6 +10,8 @@
 [Unit]
 Description=Initrd File Systems
 Documentation=man:systemd.special(7)
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
 ConditionPathExists=/etc/initrd-release
 After=initrd-parse-etc.service
 DefaultDependencies=no

diff --git a/units/initrd-root-device.target b/units/initrd-root-device.target
index bc2743e2d5438ef8407b3ca47652a32c104f78df..580c666b2310fcde64ac3a9d5c234e1f978c6fb0 100644 (file)
--- a/units/initrd-root-device.target
+++ b/units/initrd-root-device.target
@@ -11,5 +11,7 @@
 Description=Initrd Root Device
 Documentation=man:systemd.special(7)
 ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
 DefaultDependencies=no
 Conflicts=shutdown.target

diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target
index 26897796af627ac41a3b00b2ab3ca99fad5ed660..9b955f618a5fb080c73e2c989958988c97a6d8e1 100644 (file)
--- a/units/initrd-root-fs.target
+++ b/units/initrd-root-fs.target
@@ -11,5 +11,7 @@
 Description=Initrd Root File System
 Documentation=man:systemd.special(7)
 ConditionPathExists=/etc/initrd-release
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
 DefaultDependencies=no
 Conflicts=shutdown.target

diff --git a/units/initrd.target b/units/initrd.target
index 30b3bd04d2ee59c7f4a8acdee917dcf3d811fa3d..a74a447c91ec0ce530c9dae61b9e59f54a862720 100644 (file)
--- a/units/initrd.target
+++ b/units/initrd.target
@@ -10,6 +10,8 @@
 [Unit]
 Description=Initrd Default Target
 Documentation=man:systemd.special(7)
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
 ConditionPathExists=/etc/initrd-release
 Requires=basic.target
 Wants=initrd-root-fs.target initrd-root-device.target initrd-fs.target initrd-parse-etc.service

diff --git a/units/local-fs.target b/units/local-fs.target
index da3683e948a96f6f982070ce8d9c7bcfe844a665..6ba49300870be220296c337ee4832b43af29a390 100644 (file)
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -13,3 +13,5 @@ Documentation=man:systemd.special(7)
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=local-fs-pre.target
+OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly