From 8168a005130c82167370ff2a784aca5416e9668f Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 24 Oct 2014 11:15:15 -0200
Subject: [client-cache] fix server not starting due to race condition

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4       | 3 ---
 .../modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index c62994a0..277efa05 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -8,9 +8,6 @@
 MOUNTPOINT="/opt/openslx/mnt/stage4"
 mkdir -p "$MOUNTPOINT"
 
-killall -USR1 dnbd3-server
-sleep 3
-
 if [[ "$SLX_STAGE4" == dnbd3* ]]; then
 	# dnbd3 it is
 	if [ -z "${SLX_DNBD3_SERVERS}${SLX_DNBD3_PRIO_SERVERS}" ]; then
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 705c5c89..faae9879 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,6 +2,8 @@
 
 [ -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