summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-18 12:47:23 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-18 16:02:18 +0000
commit44213f63cfcbffb167cdb73c85c562ac1fed2c0a (patch)
tree75d07cb31c05936b35ac9477684edf8b35df1b7a
parentf4708b48024c4210e09ae41f0c7d415ff3ac0ea5 (diff)
downloaddefinitions-44213f63cfcbffb167cdb73c85c562ac1fed2c0a.tar.gz
distbuild: Make systemd units require local-fs.target
These units require /srv to me mounted and can fail to start if they run before that happens. They no doubt have other filesystem requirements too.
-rw-r--r--distbuild/usr/lib/systemd/system/morph-cache-server.service4
-rw-r--r--distbuild/usr/lib/systemd/system/morph-controller.service4
-rw-r--r--distbuild/usr/lib/systemd/system/morph-worker.service4
3 files changed, 6 insertions, 6 deletions
diff --git a/distbuild/usr/lib/systemd/system/morph-cache-server.service b/distbuild/usr/lib/systemd/system/morph-cache-server.service
index 52c13573..e5faf206 100644
--- a/distbuild/usr/lib/systemd/system/morph-cache-server.service
+++ b/distbuild/usr/lib/systemd/system/morph-cache-server.service
@@ -1,7 +1,7 @@
[Unit]
Description=Morph cache server
-Requires=network.target
-After=network.target
+Requires=local-fs.target network.target
+After=local-fs.target network.target
ConditionPathExists=/etc/morph-cache-server.conf
ConditionPathIsDirectory=/srv/distbuild/artifacts
diff --git a/distbuild/usr/lib/systemd/system/morph-controller.service b/distbuild/usr/lib/systemd/system/morph-controller.service
index 983fa705..b3ba93b4 100644
--- a/distbuild/usr/lib/systemd/system/morph-controller.service
+++ b/distbuild/usr/lib/systemd/system/morph-controller.service
@@ -1,7 +1,7 @@
[Unit]
Description=Morph distributed build controller
-Requires=network.target
-After=network.target
+Requires=local-fs.target network.target
+After=local-fs.target network.target
ConditionPathExists=/etc/morph-controller.conf
[Service]
diff --git a/distbuild/usr/lib/systemd/system/morph-worker.service b/distbuild/usr/lib/systemd/system/morph-worker.service
index a789c7c4..26dcb9ad 100644
--- a/distbuild/usr/lib/systemd/system/morph-worker.service
+++ b/distbuild/usr/lib/systemd/system/morph-worker.service
@@ -1,8 +1,8 @@
[Unit]
Description=Morph distributed build worker
-Requires=network.target
+Requires=local-fs.target network.target
Wants=srv-distbuild-ccache.mount
-After=network.target srv-distbuild-ccache.mount
+After=local-fs.target network.target srv-distbuild-ccache.mount
ConditionPathExists=/etc/morph-worker.conf
[Service]