# HG changeset patch
# User Mohana Rao Gorai <mohana.gorai@oracle.com>
# Date 1395364329 25200
# Node ID 6ea41a44b2a37bbfc697d0dac45eb968fde4cf27
# Parent  614fab3c797eece26f8bd48b5d707547992419a5
18251587 customized /etc/net-snmp/snmp/snmpd.conf clobbered by "pkg fix"

diff -r 614fab3c797e -r 6ea41a44b2a3 components/net-snmp/net-snmp-base.p5m
--- a/components/net-snmp/net-snmp-base.p5m	Thu Mar 20 18:12:09 2014 -0700
+++ b/components/net-snmp/net-snmp-base.p5m	Thu Mar 20 18:12:09 2014 -0700
@@ -220,7 +220,7 @@
 file local/snmpconf.dir/snmptrapd-data/runtime path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/runtime
 file local/snmpconf.dir/snmptrapd-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
 file local/snmpconf.dir/snmptrapd-data/traphandle path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle
-file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf
+file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf preserve=renamenew
 file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml restart_fmri=svc:/system/manifest-import:default
 file svc-net-snmp path=lib/svc/method/svc-net-snmp
 file path=usr/bin/encode_keychange