From 0d9bacc91fd604fd783aa4336acc164c321b2bb0 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Wed, 23 Feb 2022 12:43:37 +0100
Subject: [PATCH] net: don't run osmo-gbproxy by default

osmo-gbproxy is not part of any of the convenience make targets in
gen_makefile.py (cn, cn-bsc, usrp). When using the typical workflow of
building one of these convenience targets first, then attempting to run
the network, the osmo-gbproxy window just says command not found.

With the default config_2g3g, it is not needed when only using one BTS,
so add a new config variable GBPROXY_RUN_IN_OSMO_DEV=0 and use it in
run.sh.

Change-Id: Ib1349809997ea6062ec3c43df92abab9fbfad1ea
---
 net/config_2g3g      | 1 +
 net/templates/run.sh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/config_2g3g b/net/config_2g3g
index 2149c39..bd27cf7 100644
--- a/net/config_2g3g
+++ b/net/config_2g3g
@@ -79,6 +79,7 @@ SGSN_GB_PORT=23000
 
 GBPROXY_IP="${TO_RAN_IP}"
 GBPROXY_GB_PORT=7777
+GBPROXY_RUN_IN_OSMO_DEV=0
 
 PCU_GB_LOCAL_PORT=23000
 
diff --git a/net/templates/run.sh b/net/templates/run.sh
index e1cf226..a5a8720 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -238,7 +238,11 @@ fi
 
 term "$hlr" HLR
 term "$sgsn" SGSN
-term "$gbproxy" GBPROXY
+
+if [ "${GBPROXY_RUN_IN_OSMO_DEV}" = 1 ]; then
+  term "$gbproxy" GBPROXY
+fi
+
 term "$mgw4msc" MGW4MSC
 term "$msc" MSC
 term "$hnbgw" HNBGW