summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-26 01:39:53 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-26 02:26:31 +0100
commitd420282b28f50720e233ccb1c02547c562195653 (patch)
tree6e03a30a4584bf5345fe7fdc1f551dba5b93458a /units
parent02b59d57e0c08231645120077f651151f5bb2bab (diff)
core: replace OnFailureIsolate= setting by a more generic OnFailureJobMode= setting and make use of it where applicable
Diffstat (limited to 'units')
-rw-r--r--units/initrd-cleanup.service.in1
-rw-r--r--units/initrd-fs.target2
-rw-r--r--units/initrd-parse-etc.service.in1
-rw-r--r--units/initrd-root-fs.target2
-rw-r--r--units/initrd-switch-root.service.in1
-rw-r--r--units/initrd.target2
-rw-r--r--units/local-fs.target2
7 files changed, 7 insertions, 4 deletions
diff --git a/units/initrd-cleanup.service.in b/units/initrd-cleanup.service.in
index 218ec807ff..b1dda16b5f 100644
--- a/units/initrd-cleanup.service.in
+++ b/units/initrd-cleanup.service.in
@@ -10,6 +10,7 @@ Description=Cleaning Up and Shutting Down Daemons
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
After=initrd-root-fs.target initrd-fs.target initrd.target
[Service]
diff --git a/units/initrd-fs.target b/units/initrd-fs.target
index 866f0d0257..7ec838a680 100644
--- a/units/initrd-fs.target
+++ b/units/initrd-fs.target
@@ -9,7 +9,7 @@
Description=Initrd File Systems
Documentation=man:systemd.special(7)
OnFailure=emergency.target
-OnFailureIsolate=yes
+OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
After=initrd-parse-etc.service
DefaultDependencies=no
diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in
index 07728e200f..c0b25430bc 100644
--- a/units/initrd-parse-etc.service.in
+++ b/units/initrd-parse-etc.service.in
@@ -11,6 +11,7 @@ DefaultDependencies=no
Requires=initrd-root-fs.target
After=initrd-root-fs.target
OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
[Service]
diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target
index d0b9863000..64f0a9291c 100644
--- a/units/initrd-root-fs.target
+++ b/units/initrd-root-fs.target
@@ -10,6 +10,6 @@ Description=Initrd Root File System
Documentation=man:systemd.special(7)
ConditionPathExists=/etc/initrd-release
OnFailure=emergency.target
-OnFailureIsolate=yes
+OnFailureJobMode=replace-irreversibly
DefaultDependencies=no
Conflicts=shutdown.target
diff --git a/units/initrd-switch-root.service.in b/units/initrd-switch-root.service.in
index 6740264149..82893dafb1 100644
--- a/units/initrd-switch-root.service.in
+++ b/units/initrd-switch-root.service.in
@@ -10,6 +10,7 @@ Description=Switch Root
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
OnFailure=emergency.target
+OnFailureJobMode=replace-irreversibly
AllowIsolate=yes
[Service]
diff --git a/units/initrd.target b/units/initrd.target
index bb9054fb89..eae7c703c1 100644
--- a/units/initrd.target
+++ b/units/initrd.target
@@ -9,7 +9,7 @@
Description=Initrd Default Target
Documentation=man:systemd.special(7)
OnFailure=emergency.target
-OnFailureIsolate=yes
+OnFailureJobMode=replace-irreversibly
ConditionPathExists=/etc/initrd-release
Requires=basic.target
Wants=initrd-root-fs.target initrd-fs.target initrd-parse-etc.service
diff --git a/units/local-fs.target b/units/local-fs.target
index 8f06ed6cab..ae3cedcb65 100644
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -12,4 +12,4 @@ After=local-fs-pre.target
DefaultDependencies=no
Conflicts=shutdown.target
OnFailure=emergency.target
-OnFailureIsolate=no
+OnFailureJobMode=replace-irreversibly