summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service4
-rwxr-xr-xserver/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache2
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