58 files changed, 5 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules
index 8e5aee3e6..70d39c481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ VYOS_LIBEXEC_DIR := usr/libexec/vyos
 VYOS_DATA_DIR := usr/share/vyos
 VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates
 VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates
+VYOS_MIBS_DIR := usr/share/snmp/mibs
 
 MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate
 SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system
@@ -84,6 +85,10 @@ override_dh_auto_install:
 	mkdir -p $(DIR)/$(VYOS_DATA_DIR)
 	cp -r data/* $(DIR)/$(VYOS_DATA_DIR)
 
+	# Install SNMP MIBs
+	mkdir -p $(DIR)/$(VYOS_MIBS_DIR)
+	cp -d mibs/* $(DIR)/$(VYOS_MIBS_DIR)
+
 	# Install etc configuration files
 	mkdir -p $(DIR)/etc
 	cp -r src/etc/* $(DIR)/etc
diff --git a/data/mibs/AGENTX-MIB.txt b/mibs/AGENTX-MIB.txt
index f9e5acd52..f9e5acd52 100644
--- a/data/mibs/AGENTX-MIB.txt
+++ b/mibs/AGENTX-MIB.txt
diff --git a/data/mibs/BGP4-MIB.txt b/mibs/BGP4-MIB.txt
index c911316c2..c911316c2 100644
--- a/data/mibs/BGP4-MIB.txt
+++ b/mibs/BGP4-MIB.txt
diff --git a/data/mibs/BRIDGE-MIB.txt b/mibs/BRIDGE-MIB.txt
index 1e77a190f..1e77a190f 100644
--- a/data/mibs/BRIDGE-MIB.txt
+++ b/mibs/BRIDGE-MIB.txt
diff --git a/data/mibs/DISMAN-EVENT-MIB.txt b/mibs/DISMAN-EVENT-MIB.txt
index f00c7cc89..f00c7cc89 100644
--- a/data/mibs/DISMAN-EVENT-MIB.txt
+++ b/mibs/DISMAN-EVENT-MIB.txt
diff --git a/data/mibs/DISMAN-EXPRESSION-MIB.txt b/mibs/DISMAN-EXPRESSION-MIB.txt
index f73e5bf5d..f73e5bf5d 100644
--- a/data/mibs/DISMAN-EXPRESSION-MIB.txt
+++ b/mibs/DISMAN-EXPRESSION-MIB.txt
diff --git a/data/mibs/DISMAN-NSLOOKUP-MIB.txt b/mibs/DISMAN-NSLOOKUP-MIB.txt
index b12ca53dd..b12ca53dd 100644
--- a/data/mibs/DISMAN-NSLOOKUP-MIB.txt
+++ b/mibs/DISMAN-NSLOOKUP-MIB.txt
diff --git a/data/mibs/DISMAN-PING-MIB.txt b/mibs/DISMAN-PING-MIB.txt
index 645ff8c7d..645ff8c7d 100644
--- a/data/mibs/DISMAN-PING-MIB.txt
+++ b/mibs/DISMAN-PING-MIB.txt
diff --git a/data/mibs/DISMAN-SCHEDULE-MIB.txt b/mibs/DISMAN-SCHEDULE-MIB.txt
index 239595e94..239595e94 100644
--- a/data/mibs/DISMAN-SCHEDULE-MIB.txt
+++ b/mibs/DISMAN-SCHEDULE-MIB.txt
diff --git a/data/mibs/DISMAN-SCRIPT-MIB.txt b/mibs/DISMAN-SCRIPT-MIB.txt
index 834f3047f..834f3047f 100644
--- a/data/mibs/DISMAN-SCRIPT-MIB.txt
+++ b/mibs/DISMAN-SCRIPT-MIB.txt
diff --git a/data/mibs/DISMAN-TRACEROUTE-MIB.txt b/mibs/DISMAN-TRACEROUTE-MIB.txt
index d207b2455..d207b2455 100644
--- a/data/mibs/DISMAN-TRACEROUTE-MIB.txt
+++ b/mibs/DISMAN-TRACEROUTE-MIB.txt
diff --git a/data/mibs/EtherLike-MIB.txt b/mibs/EtherLike-MIB.txt
index dcec7cee4..dcec7cee4 100644
--- a/data/mibs/EtherLike-MIB.txt
+++ b/mibs/EtherLike-MIB.txt
diff --git a/data/mibs/HCNUM-TC.txt b/mibs/HCNUM-TC.txt
index 4be3d547e..4be3d547e 100644
--- a/data/mibs/HCNUM-TC.txt
+++ b/mibs/HCNUM-TC.txt
diff --git a/data/mibs/HOST-RESOURCES-MIB.txt b/mibs/HOST-RESOURCES-MIB.txt
index 373b9b328..373b9b328 100644
--- a/data/mibs/HOST-RESOURCES-MIB.txt
+++ b/mibs/HOST-RESOURCES-MIB.txt
diff --git a/data/mibs/HOST-RESOURCES-TYPES.txt b/mibs/HOST-RESOURCES-TYPES.txt
index d25bb4032..d25bb4032 100644
--- a/data/mibs/HOST-RESOURCES-TYPES.txt
+++ b/mibs/HOST-RESOURCES-TYPES.txt
diff --git a/data/mibs/IF-INVERTED-STACK-MIB.txt b/mibs/IF-INVERTED-STACK-MIB.txt
index eb8797b58..eb8797b58 100644
--- a/data/mibs/IF-INVERTED-STACK-MIB.txt
+++ b/mibs/IF-INVERTED-STACK-MIB.txt
diff --git a/data/mibs/IF-MIB.txt b/mibs/IF-MIB.txt
index 7704f0c25..7704f0c25 100644
--- a/data/mibs/IF-MIB.txt
+++ b/mibs/IF-MIB.txt
diff --git a/data/mibs/INET-ADDRESS-MIB.txt b/mibs/INET-ADDRESS-MIB.txt
index a778cba6b..a778cba6b 100644
--- a/data/mibs/INET-ADDRESS-MIB.txt
+++ b/mibs/INET-ADDRESS-MIB.txt
diff --git a/data/mibs/IP-FORWARD-MIB.txt b/mibs/IP-FORWARD-MIB.txt
index 347b5e004..347b5e004 100644
--- a/data/mibs/IP-FORWARD-MIB.txt
+++ b/mibs/IP-FORWARD-MIB.txt
diff --git a/data/mibs/IP-MIB.txt b/mibs/IP-MIB.txt
index fe2db5f23..fe2db5f23 100644
--- a/data/mibs/IP-MIB.txt
+++ b/mibs/IP-MIB.txt
diff --git a/data/mibs/IPV6-FLOW-LABEL-MIB.txt b/mibs/IPV6-FLOW-LABEL-MIB.txt
index 6fb36596b..6fb36596b 100644
--- a/data/mibs/IPV6-FLOW-LABEL-MIB.txt
+++ b/mibs/IPV6-FLOW-LABEL-MIB.txt
diff --git a/data/mibs/IPV6-ICMP-MIB.txt b/mibs/IPV6-ICMP-MIB.txt
index bb66da576..bb66da576 100644
--- a/data/mibs/IPV6-ICMP-MIB.txt
+++ b/mibs/IPV6-ICMP-MIB.txt
diff --git a/data/mibs/IPV6-MIB.txt b/mibs/IPV6-MIB.txt
index 6957af27f..6957af27f 100644
--- a/data/mibs/IPV6-MIB.txt
+++ b/mibs/IPV6-MIB.txt
diff --git a/data/mibs/IPV6-TC.txt b/mibs/IPV6-TC.txt
index 05e1e7d98..05e1e7d98 100644
--- a/data/mibs/IPV6-TC.txt
+++ b/mibs/IPV6-TC.txt
diff --git a/data/mibs/IPV6-TCP-MIB.txt b/mibs/IPV6-TCP-MIB.txt
index a2fb857c0..a2fb857c0 100644
--- a/data/mibs/IPV6-TCP-MIB.txt
+++ b/mibs/IPV6-TCP-MIB.txt
diff --git a/data/mibs/IPV6-UDP-MIB.txt b/mibs/IPV6-UDP-MIB.txt
index 6c929eb7f..6c929eb7f 100644
--- a/data/mibs/IPV6-UDP-MIB.txt
+++ b/mibs/IPV6-UDP-MIB.txt
diff --git a/data/mibs/MTA-MIB.txt b/mibs/MTA-MIB.txt
index 29618adc8..29618adc8 100644
--- a/data/mibs/MTA-MIB.txt
+++ b/mibs/MTA-MIB.txt
diff --git a/data/mibs/NETWORK-SERVICES-MIB.txt b/mibs/NETWORK-SERVICES-MIB.txt
index 0f2cabecb..0f2cabecb 100644
--- a/data/mibs/NETWORK-SERVICES-MIB.txt
+++ b/mibs/NETWORK-SERVICES-MIB.txt
diff --git a/data/mibs/NOTIFICATION-LOG-MIB.txt b/mibs/NOTIFICATION-LOG-MIB.txt
index c7da93465..c7da93465 100644
--- a/data/mibs/NOTIFICATION-LOG-MIB.txt
+++ b/mibs/NOTIFICATION-LOG-MIB.txt
diff --git a/data/mibs/OSPF-MIB.txt b/mibs/OSPF-MIB.txt
index de7d03f5e..de7d03f5e 100644
--- a/data/mibs/OSPF-MIB.txt
+++ b/mibs/OSPF-MIB.txt
diff --git a/data/mibs/OSPF-TRAP-MIB.txt b/mibs/OSPF-TRAP-MIB.txt
index 8a3ab990c..8a3ab990c 100644
--- a/data/mibs/OSPF-TRAP-MIB.txt
+++ b/mibs/OSPF-TRAP-MIB.txt
diff --git a/data/mibs/RFC1155-SMI.txt b/mibs/RFC1155-SMI.txt
index 3abc7ffb7..3abc7ffb7 100644
--- a/data/mibs/RFC1155-SMI.txt
+++ b/mibs/RFC1155-SMI.txt
diff --git a/data/mibs/RFC1213-MIB.txt b/mibs/RFC1213-MIB.txt
index 408ccd796..408ccd796 100644
--- a/data/mibs/RFC1213-MIB.txt
+++ b/mibs/RFC1213-MIB.txt
diff --git a/data/mibs/RIPv2-MIB.txt b/mibs/RIPv2-MIB.txt
index 6c92fb5f0..6c92fb5f0 100644
--- a/data/mibs/RIPv2-MIB.txt
+++ b/mibs/RIPv2-MIB.txt
diff --git a/data/mibs/RMON-MIB.txt b/mibs/RMON-MIB.txt
index 983c22ef5..983c22ef5 100644
--- a/data/mibs/RMON-MIB.txt
+++ b/mibs/RMON-MIB.txt
diff --git a/data/mibs/SCTP-MIB.txt b/mibs/SCTP-MIB.txt
index 9d809d282..9d809d282 100644
--- a/data/mibs/SCTP-MIB.txt
+++ b/mibs/SCTP-MIB.txt
diff --git a/data/mibs/SMUX-MIB.txt b/mibs/SMUX-MIB.txt
index 1fe34552f..1fe34552f 100644
--- a/data/mibs/SMUX-MIB.txt
+++ b/mibs/SMUX-MIB.txt
diff --git a/data/mibs/SNMP-COMMUNITY-MIB.txt b/mibs/SNMP-COMMUNITY-MIB.txt
index bc3d4d278..bc3d4d278 100644
--- a/data/mibs/SNMP-COMMUNITY-MIB.txt
+++ b/mibs/SNMP-COMMUNITY-MIB.txt
diff --git a/data/mibs/SNMP-FRAMEWORK-MIB.txt b/mibs/SNMP-FRAMEWORK-MIB.txt
index aa273c285..aa273c285 100644
--- a/data/mibs/SNMP-FRAMEWORK-MIB.txt
+++ b/mibs/SNMP-FRAMEWORK-MIB.txt
diff --git a/data/mibs/SNMP-MPD-MIB.txt b/mibs/SNMP-MPD-MIB.txt
index d4c605b1c..d4c605b1c 100644
--- a/data/mibs/SNMP-MPD-MIB.txt
+++ b/mibs/SNMP-MPD-MIB.txt
diff --git a/data/mibs/SNMP-NOTIFICATION-MIB.txt b/mibs/SNMP-NOTIFICATION-MIB.txt
index 0ef06b648..0ef06b648 100644
--- a/data/mibs/SNMP-NOTIFICATION-MIB.txt
+++ b/mibs/SNMP-NOTIFICATION-MIB.txt
diff --git a/data/mibs/SNMP-PROXY-MIB.txt b/mibs/SNMP-PROXY-MIB.txt
index 4a72e8603..4a72e8603 100644
--- a/data/mibs/SNMP-PROXY-MIB.txt
+++ b/mibs/SNMP-PROXY-MIB.txt
diff --git a/data/mibs/SNMP-TARGET-MIB.txt b/mibs/SNMP-TARGET-MIB.txt
index 654afdd69..654afdd69 100644
--- a/data/mibs/SNMP-TARGET-MIB.txt
+++ b/mibs/SNMP-TARGET-MIB.txt
diff --git a/data/mibs/SNMP-USER-BASED-SM-MIB.txt b/mibs/SNMP-USER-BASED-SM-MIB.txt
index 3b714030c..3b714030c 100644
--- a/data/mibs/SNMP-USER-BASED-SM-MIB.txt
+++ b/mibs/SNMP-USER-BASED-SM-MIB.txt
diff --git a/data/mibs/SNMP-USM-AES-MIB.txt b/mibs/SNMP-USM-AES-MIB.txt
index 4c1730219..4c1730219 100644
--- a/data/mibs/SNMP-USM-AES-MIB.txt
+++ b/mibs/SNMP-USM-AES-MIB.txt
diff --git a/data/mibs/SNMP-USM-DH-OBJECTS-MIB.txt b/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
index 7377425c0..7377425c0 100644
--- a/data/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
+++ b/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
diff --git a/data/mibs/SNMP-VIEW-BASED-ACM-MIB.txt b/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
index 7244ad0af..7244ad0af 100644
--- a/data/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
+++ b/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
diff --git a/data/mibs/SNMPv2-CONF.txt b/mibs/SNMPv2-CONF.txt
index 24a1eed95..24a1eed95 100644
--- a/data/mibs/SNMPv2-CONF.txt
+++ b/mibs/SNMPv2-CONF.txt
diff --git a/data/mibs/SNMPv2-MIB.txt b/mibs/SNMPv2-MIB.txt
index 8c828305e..8c828305e 100644
--- a/data/mibs/SNMPv2-MIB.txt
+++ b/mibs/SNMPv2-MIB.txt
diff --git a/data/mibs/SNMPv2-SMI.txt b/mibs/SNMPv2-SMI.txt
index 1c01e1dfc..1c01e1dfc 100644
--- a/data/mibs/SNMPv2-SMI.txt
+++ b/mibs/SNMPv2-SMI.txt
diff --git a/data/mibs/SNMPv2-TC.txt b/mibs/SNMPv2-TC.txt
index 860bf71ee..860bf71ee 100644
--- a/data/mibs/SNMPv2-TC.txt
+++ b/mibs/SNMPv2-TC.txt
diff --git a/data/mibs/SNMPv2-TM.txt b/mibs/SNMPv2-TM.txt
index 949f99c7e..949f99c7e 100644
--- a/data/mibs/SNMPv2-TM.txt
+++ b/mibs/SNMPv2-TM.txt
diff --git a/data/mibs/SOURCE-ROUTING-MIB.txt b/mibs/SOURCE-ROUTING-MIB.txt
index 988b1b0e8..988b1b0e8 100644
--- a/data/mibs/SOURCE-ROUTING-MIB.txt
+++ b/mibs/SOURCE-ROUTING-MIB.txt
diff --git a/data/mibs/TCP-MIB.txt b/mibs/TCP-MIB.txt
index 50e7f5752..50e7f5752 100644
--- a/data/mibs/TCP-MIB.txt
+++ b/mibs/TCP-MIB.txt
diff --git a/data/mibs/TRANSPORT-ADDRESS-MIB.txt b/mibs/TRANSPORT-ADDRESS-MIB.txt
index 227886e78..227886e78 100644
--- a/data/mibs/TRANSPORT-ADDRESS-MIB.txt
+++ b/mibs/TRANSPORT-ADDRESS-MIB.txt
diff --git a/data/mibs/TUNNEL-MIB.txt b/mibs/TUNNEL-MIB.txt
index 5f9596b58..5f9596b58 100644
--- a/data/mibs/TUNNEL-MIB.txt
+++ b/mibs/TUNNEL-MIB.txt
diff --git a/data/mibs/UDP-MIB.txt b/mibs/UDP-MIB.txt
index eec9dbadb..eec9dbadb 100644
--- a/data/mibs/UDP-MIB.txt
+++ b/mibs/UDP-MIB.txt
diff --git a/data/mibs/VYATTA-TRAP-MIB.txt b/mibs/VYATTA-TRAP-MIB.txt
index 9983c2947..9983c2947 100644
--- a/data/mibs/VYATTA-TRAP-MIB.txt
+++ b/mibs/VYATTA-TRAP-MIB.txt