Merge commit 'f01baf4cfbdb55ac223903f14b9ab5aee3cf983a' into dora

This commit is contained in:
Harald Welte 2015-02-13 19:26:28 +01:00
commit 729ec80937
2 changed files with 7 additions and 4 deletions

View File

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:"
PRINC = "7" PRINC = "8"
# systemd does not look at /etc/rcS.d for the script. Make sure # systemd does not look at /etc/rcS.d for the script. Make sure
# there is a symlink available # there is a symlink available

View File

@ -12,9 +12,9 @@ iface eth0 inet dhcp
#eth1 is our admin interface and will provide dhcp to clients #eth1 is our admin interface and will provide dhcp to clients
auto eth1 auto eth1
iface eth1 inet static iface eth1 inet static
address 10.23.24.1 address 172.16.6.1
netmask 255.255.255.0 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 # eth2 is attached to the IDU-internal SOB-JB02-SW
auto eth2 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 # * we use the bridging code so we can run mstpd and become the root bridge
auto br0 auto br0
iface br0 inet manual iface br0 inet static
bridge_ports eth2 bridge_ports eth2
bridge_maxwait 0 bridge_maxwait 0
address 172.16.4.1
netmask 255.255.254.0
network 172.16.4.0
# VLAN 6: management VLAN # VLAN 6: management VLAN
auto br0.6 auto br0.6