From 78c775e3c79371401747fa2c2874b19923c5f421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= <jsafrane@fedoraproject.org>
Date: Tue, 12 Feb 2008 15:28:05 +0000
Subject: [PATCH] introduce /etc/sysconfig/snmpd. Use it to specify snmpd
 command line     options. /etc/snmp/snmpd.options is not used anymore
 Resolves: #431391

---
 net-snmp.spec       | 11 ++++++++++-
 net-snmpd.init      |  8 ++++----
 net-snmpd.sysconfig |  2 ++
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 net-snmpd.sysconfig

diff --git a/net-snmp.spec b/net-snmp.spec
index 4f879f5..70a0809 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -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 @@ Source5: ucd5820stat
 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 -d ${RPM_BUILD_ROOT}%{_initrddir}
 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 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_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 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/lib*.so.*
 
 %changelog
+* Tue Feb 12 2008 Jan Safranek <jsafranek@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@redhat.com> 5.4.1-8
 - init scripts made LSB compliant
 
diff --git a/net-snmpd.init b/net-snmpd.init
index 66d2a97..ccefa69 100755
--- a/net-snmpd.init
+++ b/net-snmpd.init
@@ -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
diff --git a/net-snmpd.sysconfig b/net-snmpd.sysconfig
new file mode 100644
index 0000000..a45ba4e
--- /dev/null
+++ b/net-snmpd.sysconfig
@@ -0,0 +1,2 @@
+# snmpd command line options
+# OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd.pid -a"