From abe0c658923524cb3931227a5a29bb1dd692aacb Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 12 May 2015 22:21:38 +0200 Subject: [PATCH] idu /etc/network/interfaces: Major update * add interface for connection to Inmarsat * remove 'br0' and work directly with 'eth2' instead, to avoid bridges in vlans of bridges * bridge the video LAN also into the backbone (for later break-out) --- .../init-ifupdown/sysmocom-idu/interfaces | 64 +++++++++++++------ .../init-ifupdown/init-ifupdown_sysmocom.inc | 2 +- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces index da24596..86d2c8b 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces +++ b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces @@ -26,12 +26,17 @@ iface eth0.2001 inet manual # VLAN 2002: Reserved for a future Inmarsat satellite modem # attached to port 7 of the IES-3080 auto eth0.2002 -iface eth0.2002 inet dhcp +#iface eth0.2002 inet dhcp +iface eth0.2002 inet manual # management VLAN of IES-3080 switch (172.16.2.3) auto eth0.6 iface eth0.6 inet manual +# video VLAN on IES-3080 +auto eth0.9 +iface eth0.9 inet manual + #eth1 is our admin interface and will provide dhcp to clients auto eth1 iface eth1 inet static @@ -41,14 +46,7 @@ iface eth1 inet static # eth2 is attached to the IDU-internal SOB-JB02-SW auto eth2 -iface eth2 inet manual - pre-up ifconfig $IFACE up - pre-down ifconfig $IFACE down - -# * br0 is a bridge interface on top of eth2 -# * we use the bridging code so we can run mstpd and become the root bridge -auto br0 -iface br0 inet static +iface eth2 inet static bridge_ports eth2 bridge_maxwait 0 address 172.16.4.1 @@ -56,18 +54,27 @@ iface br0 inet static network 172.16.4.0 # management VLAN towards {N,P}JB -auto br0.6 -iface br0.6 inet manual +auto eth2.6 +iface eth2.6 inet manual # bridge for VLAN 6: management VLAN auto br-mgmt iface br-mgmt inet static - bridge_ports br0.6 eth0.6 + bridge_ports eth2.6 eth0.6 bridge_maxwait 0 address 172.16.2.1 netmask 255.255.254.0 network 172.16.2.0 +# bridge for VLAN9: video +auto br-video +iface br-video inet static + bridge_ports eth2.9 eth0.9 + bridge_maxwait 0 + address 172.16.9.1 + netmask 255.255.255.0 + network 172.16.9.0 + # 172.16.1.1 is the service IP address for SOBMGMT auto br-mgmt:0 iface br-mgmt:0 inet static @@ -75,29 +82,46 @@ iface br-mgmt:0 inet static netmask 255.255.255.255 # GSM management VLAN -auto br0.7 -iface br0.7 inet static +auto eth2.7 +iface eth2.7 inet static address 172.16.7.1 netmask 255.255.255.0 network 172.16.7.0 +# Video VLAN on JB02, part of br-video +auto eth2.9 +iface eth2.9 inet manual + # admin WiFi -auto br0.1001 -iface br0.1001 inet static +auto eth2.1001 +iface eth2.1001 inet static address 172.16.8.1 netmask 255.255.255.0 network 172.16.8.0 # onboad WiFi -auto br0.1002 -iface br0.1002 inet static +auto eth2.1002 +iface eth2.1002 inet static address 172.16.128.1 netmask 255.255.252.0 network 172.16.128.0 # remote WiFi -auto br0.1003 -iface br0.1003 inet static +auto eth2.1003 +iface eth2.1003 inet static address 172.16.132.1 netmask 255.255.252.0 network 172.16.132.0 + +# JB-facing device for Inmarsat Satlite Crew +auto eth2.1004 +iface eth2.1004 inet manual + +# uplink of Inmarsat Satlite Crew +auto eth0.1004 +iface eth0.1004 inet manual + +auto br-satlite +iface br-satlite inet manual + bridge_ports eth0.1004 eth2.1004 + bridge_maxwait 0 diff --git a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc index 38a87da..a36a3e8 100644 --- a/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc +++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:" -PRINC = "12" +PRINC = "13" # systemd does not look at /etc/rcS.d for the script. Make sure # there is a symlink available