summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-06-13 16:20:13 +0200
committerChristian Poessinger <christian@poessinger.com>2021-06-13 16:22:19 +0200
commitc40dd177b1ab62e311aa8c94e8032ca3b57fd934 (patch)
treebd3e073870b3d6b18829bfea79dc4a0da3de1b46
parentc8fa393ae661dc9aae7890081a6af57d0dc21cdf (diff)
downloadvyos-1x-c40dd177b1ab62e311aa8c94e8032ca3b57fd934.tar.gz
vyos-1x-c40dd177b1ab62e311aa8c94e8032ca3b57fd934.zip
snmp: T3606: fix unknown notification OID
Commit 945300c6f5 ("snmp: mibs: import from vyatta-cfg-system") imported the MIBs from vyatta-cfg-system and provided them with a symlink to /usr/share/vyos/mibs. The symlink was never installed as the directory already existed. Adjust the MIBDIRS environment variable to load the MIBs from the proper VyOS folder and use no symlink at all.
-rw-r--r--data/templates/snmp/override.conf.tmpl2
-rw-r--r--debian/vyos-1x.links1
2 files changed, 1 insertions, 2 deletions
diff --git a/data/templates/snmp/override.conf.tmpl b/data/templates/snmp/override.conf.tmpl
index 68f5fd931..90c294ed0 100644
--- a/data/templates/snmp/override.conf.tmpl
+++ b/data/templates/snmp/override.conf.tmpl
@@ -5,7 +5,7 @@ After=vyos-router.service
[Service]
Environment=
-Environment="MIBSDIR=/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp"
+Environment="MIBDIRS=/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf:/usr/share/vyos/mibs"
ExecStart=
ExecStart={{vrf_command}}/usr/sbin/snmpd -LS0-5d -Lf /dev/null -u Debian-snmp -g Debian-snmp -I -ipCidrRouteTable,inetCidrRouteTable -f -p /run/snmpd.pid
Restart=always
diff --git a/debian/vyos-1x.links b/debian/vyos-1x.links
deleted file mode 100644
index ea4e4e7da..000000000
--- a/debian/vyos-1x.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vyos/mibs /usr/share/snmp/mibs