diff options
Diffstat (limited to 'core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy')
| -rwxr-xr-x | core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy index f1f6b63d..ad3bf36b 100755 --- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy +++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-dnbd3_proxy @@ -4,6 +4,7 @@ ERRLOG="/run/dnbd3-proxy.err" if [ -s "$ERRLOG" ]; then exec "$(which dnbd3-server)" -n --errormsg "$(cat "$ERRLOG")" -c /etc/dnbd3-server + exit 1 fi if [ -d "/mnt/dnbd3" ]; then @@ -12,30 +13,6 @@ else set -- fi -# Force immediate switch to localhost for stage4 if applicable -if [ -d "/mnt/dnbd3" ] && [ -b /dev/dnbd0 ] \ - && [ "$( cat /sys/block/dnbd0/net/rid )" -gt 0 ]; then -( - DNBD3_PORT=5003 - # give it some time to start - usleep 250000 - if ! grep -q -F 127.0.0.1 /sys/block/dnbd0/net/alt_servers; then - # add the server - if ! dnbd3-client -A "127.0.0.1:$DNBD3_PORT" -d /dev/dnbd0; then - echo "WARN: Cannot add localhost to dnbd0" >&2 - fi - fi - for i in 1 2 3 4 5 6 7; do - echo | busybox timeout 1 busybox nc 127.0.0.1 "$DNBD3_PORT" && break - echo "WARN: port wait fail #$i" - usleep ${i}00000 # tenths of a second - done - if ! dnbd3-client -s "127.0.0.1:$DNBD3_PORT" -d /dev/dnbd0; then - echo "ERROR: Cannot switch dnbd0 to localhost" >&2 - fi -) & -fi - exec "$(which dnbd3-server)" -n -c /etc/dnbd3-server "$@" exit 1 |