Merge commit 'a3b942cdd9cb675589ac424130003b892208f371' into dora

This commit is contained in:
Harald Welte 2015-05-01 19:47:16 +02:00
commit 65bed443a2
2 changed files with 6 additions and 1 deletions

View File

@ -23,6 +23,11 @@ iface eth0.2000 inet static
auto eth0.2001
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
# management VLAN of IES-3080 switch (172.16.2.3)
auto eth0.6
iface eth0.6 inet manual

View File

@ -13,7 +13,7 @@ SRC_URI = " \
SRC_URI[tar.md5sum] = "ee737c774e01349f75e935228a2d851b"
SRC_URI[tar.sha256sum] = "036b032a5c4d180aad686df21399d74506b9b3d3000794eb13ac313482e24896"
inherit autotools-brokensep update-rc.d pkgconfig
inherit autotools update-rc.d pkgconfig
INITSCRIPT_NAME = "conntrackd"