diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-22 12:51:15 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-22 17:58:12 +0200 |
| commit | 74c8e3c4e082121d8bc578d07d7a3843c61c2bd1 (patch) | |
| tree | 53d05f0782effc0d3a475d9263dc10b362a58cd4 | |
| parent | 771b52427a8aad070e607a0c1ae3b7a46a36db00 (diff) | |
| download | systemd-74c8e3c4e082121d8bc578d07d7a3843c61c2bd1.tar.gz | |
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.
| -rw-r--r-- | units/initrd-fs.target | 2 | ||||
| -rw-r--r-- | units/initrd-root-device.target | 2 | ||||
| -rw-r--r-- | units/initrd-root-fs.target | 2 | ||||
| -rw-r--r-- | units/initrd.target | 2 | ||||
| -rw-r--r-- | units/local-fs.target | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/units/initrd-fs.target b/units/initrd-fs.target index 1db8fb3a48..33822bde66 100644 --- 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 bc2743e2d5..580c666b23 100644 --- 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 26897796af..9b955f618a 100644 --- 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 30b3bd04d2..a74a447c91 100644 --- 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 da3683e948..6ba4930087 100644 --- 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 |