From 44213f63cfcbffb167cdb73c85c562ac1fed2c0a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 18 Mar 2014 12:47:23 +0000 Subject: 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. --- distbuild/usr/lib/systemd/system/morph-cache-server.service | 4 ++-- distbuild/usr/lib/systemd/system/morph-controller.service | 4 ++-- distbuild/usr/lib/systemd/system/morph-worker.service | 4 ++-- 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] -- cgit v1.2.1