From be388bd7d5d387800598bb3b72909e118f202106 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 10 Feb 2017 16:25:13 +0100 Subject: [PATCH 1/2] openggsn-config: share one gprs_routing file for different machines there's no point in having two identical gprs_routing files in the two machine-specific directories. So let's share one common file. --- .../files/{sysmobts-v2 => }/gprs_routing | 0 .../files/sysmocom-bsc/gprs_routing | 23 ------------------- 2 files changed, 23 deletions(-) rename recipes-config/openggsn-config/files/{sysmobts-v2 => }/gprs_routing (100%) delete mode 100755 recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing diff --git a/recipes-config/openggsn-config/files/sysmobts-v2/gprs_routing b/recipes-config/openggsn-config/files/gprs_routing similarity index 100% rename from recipes-config/openggsn-config/files/sysmobts-v2/gprs_routing rename to recipes-config/openggsn-config/files/gprs_routing diff --git a/recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing b/recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing deleted file mode 100755 index 016b425b7b..0000000000 --- a/recipes-config/openggsn-config/files/sysmocom-bsc/gprs_routing +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME=gprs_routing - -set -e - -case "$1" in - start) - echo 1 > /proc/sys/net/ipv4/ip_forward - iptables -t nat -I POSTROUTING -o eth0 -j MASQUERADE - echo "Enabled masquerading" - ;; - stop) - echo 0 > /proc/sys/net/ipv4/ip_forward - iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 -esac - -exit 0 From 0c4a046bd5c1f790bb547f53f0b5ee049c7ab885 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 10 Feb 2017 16:30:46 +0100 Subject: [PATCH 2/2] openggsn-config: Use the sysmocom-bsc/ggsn.conf as default for all machines Only sysmobts-v2 will override it, but all other machines should have the same configuration as the sysmocom-bsc. This will fix the build of our yocto-dora for sysmocom-idu/sysmocom-odu, where task-sysmocom-feed pulls in task-gprscore which in turn wants to build the ggsn configuration even on those machines where we don't actually have a ggsn so far. --- recipes-config/openggsn-config/files/{sysmocom-bsc => }/ggsn.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-config/openggsn-config/files/{sysmocom-bsc => }/ggsn.conf (100%) diff --git a/recipes-config/openggsn-config/files/sysmocom-bsc/ggsn.conf b/recipes-config/openggsn-config/files/ggsn.conf similarity index 100% rename from recipes-config/openggsn-config/files/sysmocom-bsc/ggsn.conf rename to recipes-config/openggsn-config/files/ggsn.conf