diff options
| author | Michael Pereira Neves | 2014-10-24 18:19:29 +0200 |
|---|---|---|
| committer | Michael Pereira Neves | 2014-10-28 14:19:55 +0100 |
| commit | 9fae164ab6be88905f1614e5093a3e899a1fc891 (patch) | |
| tree | c9415ba562349ddc520b8384374e188aece49b7c | |
| parent | [client-cache] fix server not starting due to race condition (diff) | |
| download | tm-scripts-9fae164ab6be88905f1614e5093a3e899a1fc891.tar.gz tm-scripts-9fae164ab6be88905f1614e5093a3e899a1fc891.tar.xz tm-scripts-9fae164ab6be88905f1614e5093a3e899a1fc891.zip | |
[client-cache] second try to solve race condition...
| -rw-r--r-- | server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service | 4 | ||||
| -rwxr-xr-x | server/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 |