From e0a96e7bb915170604a1e995412b1d7cce1b25f0 Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Sat, 18 Feb 2017 02:04:55 +0000 Subject: [PATCH] Move sysDescription to /etc/snmp --- dockers/docker-snmp-sv2/config.sh | 6 +----- src/sonic-snmpagent | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dockers/docker-snmp-sv2/config.sh b/dockers/docker-snmp-sv2/config.sh index 0681416b1acb..b8f72c79bba8 100755 --- a/dockers/docker-snmp-sv2/config.sh +++ b/dockers/docker-snmp-sv2/config.sh @@ -1,11 +1,7 @@ #!/bin/bash -mkdir -p /etc/ssw - -sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/sonic_version.yml -t /etc/swss/snmp/sysDescription.j2 >/etc/ssw/sysDescription - mkdir -p /etc/snmp - +sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/sonic_version.yml -t /etc/swss/snmp/sysDescription.j2 >/etc/snmp/sysDescription sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/snmp.yml -t /etc/swss/snmp/snmpd.conf.j2 >/etc/snmp/snmpd.conf hwsku=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku` diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent index a3391a9c709a..e6375e9e69de 160000 --- a/src/sonic-snmpagent +++ b/src/sonic-snmpagent @@ -1 +1 @@ -Subproject commit a3391a9c709a1160dd7d261ac1da2013127c3d45 +Subproject commit e6375e9e69de84d1fc63f49516479409718afeab