From 9fae164ab6be88905f1614e5093a3e899a1fc891 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 24 Oct 2014 14:19:29 -0200
Subject: [client-cache] second try to solve race condition...

---
 .../modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service  | 4 ++--
 .../modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
index 518fb152..9ca6353d 100644
--- a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Setup dnbd3-server as proxy/cache daemon
-Requires=setup-dnbd3.service
-After=sysinit.target setup-dnbd3.service
+Requires=setup-dnbd3.service setup-partitions.service
+After=sysinit.target setup-dnbd3.service setup-partitions.service
 Before=shutdown.target
 DefaultDependencies=no
 
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
index faae9879..705c5c89 100755
--- a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -2,8 +2,6 @@
 
 [ -d "/cache/export/dnbd3" ] ||  mkdir -p /cache/export/dnbd3/
 
-[ -e /var/run/dnbd3.socket ] || sleep 2 # Ugly, service should only start when dnbd3 daemon is up and running
-
 exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
 slxlog "dnbd3-server" "Error launching dnbd3-server"
 exit 1
-- 
cgit v1.2.3-55-g7522