From 5afdf4449e0c1eeca4e8b2f3c4141f49f0bf1b04 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 2 Nov 2017 13:51:49 +0100
Subject: [dnbd3-proxy-mode] Support new lookupMissingForProxy option of
 dnbd3-server

---
 .../data/opt/openslx/scripts/systemd-setup_dnbd3_proxy            | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'core/modules/dnbd3-proxy-mode')

diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
index f5915ee7..e493bdfe 100755
--- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
+++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy
@@ -65,7 +65,12 @@ fi
 . /opt/openslx/config
 
 DNBD3_BGR="false"
-[ -n "${SLX_DNBD3_BGR}" ] && DNBD3_BGR="true"
+DNBD3_LOOKUP="false"
+if [ -n "${SLX_DNBD3_BGR}" ]; then
+	DNBD3_BGR="true"
+	# Only do chained lookup of image if we're a global proxy with BGR
+	[ -z "${SLX_DNBD3_WHITELIST}" ] && DNBD3_LOOKUP="true"
+fi
 DNBD3_PORT=5003
 rm -f "${DNBD3_CONF_DIR}/server.conf"
 # Refer to http://git.openslx.org/dnbd3.git/tree/conf for configuration options
@@ -77,6 +82,7 @@ serverPenalty=100000
 clientPenalty=0
 isProxy=true
 backgroundReplication=${DNBD3_BGR}
+lookupMissingForProxy=${DNBD3_LOOKUP}
 removeMissingImages=false
 uplinkTimeout=5000
 clientTimeout=15000
-- 
cgit v1.2.3-55-g7522