Change in osmo-dev[master]: net: don't run osmo-gbproxy by default

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27449 ) Change subject: net: don't run osmo-gbproxy by default ...................................................................... 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 --- M net/config_2g3g M net/templates/run.sh 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/49/27449/1 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 @@ 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 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ib1349809997ea6062ec3c43df92abab9fbfad1ea Gerrit-Change-Number: 27449 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange