From f01baf4cfbdb55ac223903f14b9ab5aee3cf983a Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 13 Feb 2015 19:20:38 +0100 Subject: [PATCH] [idu]: Update /etc/network/interfaces On eth1 we should also use a network from the 172.16 block rather than the 10.23 that we used on the sysmoBSC Also, we now use 172.16.4.0/23 natively on the bridged onboard network, this is a temporary measure so existing JBs will still connect and get an IP address before their software is updated to use VLAN6. After they (and all APs, BTSs, etc.) have migrated, the 172.16.4.0/23 can be removed. --- recipes-bsp/netbase/init-ifupdown_sysmocom.inc | 2 +- recipes-bsp/netbase/netbase/sysmocom-idu/interfaces | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc b/recipes-bsp/netbase/init-ifupdown_sysmocom.inc index 6544588..fe6f3b7 100644 --- a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc +++ b/recipes-bsp/netbase/init-ifupdown_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:" -PRINC = "7" +PRINC = "8" # systemd does not look at /etc/rcS.d for the script. Make sure # there is a symlink available diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces b/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces index 2503cd8..2abde33 100644 --- a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces +++ b/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces @@ -12,9 +12,9 @@ iface eth0 inet dhcp #eth1 is our admin interface and will provide dhcp to clients auto eth1 iface eth1 inet static - address 10.23.24.1 + address 172.16.6.1 netmask 255.255.255.0 - network 10.23.24.0 + network 172.16.6.0 # eth2 is attached to the IDU-internal SOB-JB02-SW auto eth2 @@ -26,9 +26,12 @@ iface eth2 inet manual # * we use the bridging code so we can run mstpd and become the root bridge auto br0 -iface br0 inet manual +iface br0 inet static bridge_ports eth2 bridge_maxwait 0 + address 172.16.4.1 + netmask 255.255.254.0 + network 172.16.4.0 # VLAN 6: management VLAN auto br0.6