Merge commit '259e1fa468e8af48c6e3382fe5de025d10bb8fbc' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-04-15 18:39:45 -04:00
commit aa5270f6b1
2 changed files with 16 additions and 3 deletions

View File

@ -6,9 +6,13 @@ iface lo inet loopback
# eth0 is attached to the IDU-internal managed switch
# in the future we will use VLANs to use individual switch ports as
# break-out interfaces. For now we simply do DHCP.
iface eth0 inet dhcp
post-up ip r add 10.6.1.0/24 via 192.168.0.1
# break-out interfaces. For now we simply do static config for use with
# the iridium openport satmodem
iface eth0 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
#eth1 is our admin interface and will provide dhcp to clients
auto eth1
@ -46,3 +50,9 @@ auto br0.6:0
iface br0.6: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

View File

@ -132,6 +132,9 @@ dhcp-range=native,172.16.4.10,172.16.4.254,255.255.254.0,168h
# DHCP range for administrative access via eth1
dhcp-range=admin,172.16.6.2,172.16.6.255,255.255.255.0,24h
# DHCP range for all BTS
dhcp-range=gsm,172.16.7.10,172.16.7.255,255.255.255.0,168h
# This is an example of a DHCP range with a network-id, so that
# some DHCP options may be set only for this network.