summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-08-22 10:09:39 +0800
committerTom Gundersen <teg@jklm.no>2013-09-11 14:40:58 +0200
commit40f862e3aee1a7712a4867b807e6ab96173bd9cb (patch)
treed2cf81fb55d8328e1e301bddf189dd1193328b1c /units
parent1361a3e33a1a43a3ea0563df6e4fbb26fe4bb1ab (diff)
filesystem targets: disable default dependencies
This means we can use default dependencies on mount units without having to get them automatically ordered before the filesystem targets. Reported-by: Thomas Baechler <thomas@archlinux.org>
Diffstat (limited to 'units')
-rw-r--r--units/initrd-fs.target2
-rw-r--r--units/initrd-root-fs.target2
-rw-r--r--units/local-fs.target2
-rw-r--r--units/remote-fs.target2
4 files changed, 8 insertions, 0 deletions
diff --git a/units/initrd-fs.target b/units/initrd-fs.target
index 7578b8824b..866f0d0257 100644
--- a/units/initrd-fs.target
+++ b/units/initrd-fs.target
@@ -12,3 +12,5 @@ OnFailure=emergency.target
OnFailureIsolate=yes
ConditionPathExists=/etc/initrd-release
After=initrd-parse-etc.service
+DefaultDependencies=no
+Conflicts=shutdown.target
diff --git a/units/initrd-root-fs.target b/units/initrd-root-fs.target
index cd189f0296..d0b9863000 100644
--- a/units/initrd-root-fs.target
+++ b/units/initrd-root-fs.target
@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
ConditionPathExists=/etc/initrd-release
OnFailure=emergency.target
OnFailureIsolate=yes
+DefaultDependencies=no
+Conflicts=shutdown.target
diff --git a/units/local-fs.target b/units/local-fs.target
index 18c3d74f18..8f06ed6cab 100644
--- a/units/local-fs.target
+++ b/units/local-fs.target
@@ -9,5 +9,7 @@
Description=Local File Systems
Documentation=man:systemd.special(7)
After=local-fs-pre.target
+DefaultDependencies=no
+Conflicts=shutdown.target
OnFailure=emergency.target
OnFailureIsolate=no
diff --git a/units/remote-fs.target b/units/remote-fs.target
index 09213e8fca..43ffa5c107 100644
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@ -9,6 +9,8 @@
Description=Remote File Systems
Documentation=man:systemd.special(7)
After=remote-fs-pre.target
+DefaultDependencies=no
+Conflicts=shutdown.target
[Install]
WantedBy=multi-user.target