rpms/net-snmp/devel net-snmpd.sysconfig, NONE, 1.1 net-snmp.spec, 1.140, 1.141 net-snmpd.init, 1.5, 1.6

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23438

Modified Files:
	net-snmp.spec net-snmpd.init 
Added Files:
	net-snmpd.sysconfig 
Log Message:
introduce /etc/sysconfig/snmpd. Use it to specify snmpd command line options. /etc/snmp/snmpd.options is not used anymore
Resolves: #431391


--- NEW FILE net-snmpd.sysconfig ---
# snmpd command line options
# OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid -a"


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- net-snmp.spec	28 Jan 2008 12:49:25 -0000	1.140
+++ net-snmp.spec	12 Feb 2008 15:28:05 -0000	1.141
@@ -7,7 +7,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 
 License: BSD and CMU
@@ -22,6 +22,7 @@
 Source6: net-snmp-config.h
 Source7: net-snmp-config
 Source8: net-snmp-trapd.redhat.conf
+Source9: net-snmpd.sysconfig
 Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
 Patch2: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch3: net-snmp-5.0.8-readonly.patch
@@ -252,6 +253,9 @@
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/snmpd
 install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_initrddir}/snmptrapd
 
+install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 %SOURCE9 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/snmpd
+
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/snmpd
 
@@ -331,6 +335,7 @@
 %{_initrddir}/snmpd
 %{_initrddir}/snmptrapd
 %config(noreplace) %{_sysconfdir}/logrotate.d/snmpd
+%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmpd.conf
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmptrapd.conf
 %{_datadir}/snmp
@@ -379,6 +384,10 @@
 %{_libdir}/lib*.so.*
 
 %changelog
+* Tue Feb 12 2008 Jan Safranek <jsafranek at redhat.com> 5.4.1-9
+- introduce /etc/sysconfig/snmpd. Use it to specify snmpd command line options.
+  /etc/snmp/snmpd.options is not used anymore (#431391)
+
 * Mon Jan 28 2008 Jan Safranek <jsafranek at redhat.com> 5.4.1-8
 - init scripts made LSB compliant
 


Index: net-snmpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- net-snmpd.init	28 Jan 2008 12:49:25 -0000	1.5
+++ net-snmpd.init	12 Feb 2008 15:28:05 -0000	1.6
@@ -24,10 +24,10 @@
 # source function library
 . /etc/init.d/functions
 
-if [ -e /etc/snmp/snmpd.options ]; then
-  . /etc/snmp/snmpd.options
-else
-   OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid -a"
+
+OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid -a"
+if [ -e /etc/sysconfig/snmpd ]; then
+  . /etc/sysconfig/snmpd
 fi
 
 RETVAL=0