idu /etc/network/interfaces: Add VLANs for iridium, switch mgmt

recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces

@@ -4,15 +4,27 @@
 auto lo
 iface lo inet loopback
 
-# eth0 is attached to the IDU-internal managed switch
+# eth0 is attached to the IDU-internal managed switch (IES-3080)
 # in the future we will use VLANs to use individual switch ports as
-# break-out interfaces.  For now we simply do static config for use with
-# the iridium openport satmodem
-iface eth0 inet static
+# break-out interfaces.  For now we simply do DHCP.
+
+# VLAN 2000: The iridium openport satellite modem attached to
+# port 1 of the IES-3080
+auto eth0.2000
+iface eth0.2000 inet static
 	address 192.168.0.254
 	netmask 255.255.255.0
 	network 192.168.0.0
-        post-up ip r add 10.6.1.0/24 via 192.168.0.1
+	post-up ip r add 10.6.1.0/24 via 192.168.0.1
+
+# VLAN 2001: Reserved for a future C-Band satellite modem
+# attached to port 8 of the IES-3080
+auto eth0.2001
+iface eth0.2001 inet manual
+
+# management VLAN of IES-3080 switch (172.16.2.3)
+auto eth0.6
+iface eth0.6 inet manual
 
 #eth1 is our admin interface and will provide dhcp to clients
 auto eth1
@@ -29,7 +41,6 @@ iface eth2 inet manual
 
 # * 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
 	bridge_ports eth2
@@ -38,21 +49,27 @@ iface br0 inet static
 	netmask 255.255.254.0
 	network 172.16.4.0
 
-# VLAN 6: management VLAN
+# management VLAN towards {N,P}JB
 auto br0.6
-iface br0.6 inet static
+iface br0.6 inet manual
+
+# bridge for VLAN 6: management VLAN
+auto br-mgmt
+iface br-mgmt inet static
+	bridge_ports br0.6 eth0.6
+	bridge_maxwait 0
 	address 172.16.2.1
 	netmask 255.255.254.0
 	network 172.16.2.0
 
 # 172.16.1.1 is the service IP address for SOBMGMT
-auto br0.6:0
-iface br0.6:0 inet static
+auto br-mgmt:0
+iface br-mgmt:0 inet static
 	address 172.16.1.1
 	netmask 255.255.255.255
 
 auto br0.7
 iface br0.7 inet static
-    address 172.16.7.1
-    netmask 255.255.255.0
-    network 172.16.7.0
+	address 172.16.7.1
+	netmask 255.255.255.0
+	network 172.16.7.0

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 = "10"
+PRINC = "11"
 
 # systemd does not look at /etc/rcS.d for the script. Make sure
 # there is a symlink available