- fix init script, read .options files from /etc/snmp (#195702)

net-snmp.spec

@@ -6,7 +6,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3.1.rc4
-Release: 1.1
+Release: 2
 
 License: BSDish
 Group: System Environment/Daemons
@@ -344,6 +344,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Radek Vokál <rvokal@redhat.com> 5.3.1.rc4-2
+- fix init script, read .options files from /etc/snmp (#195702)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.3.1.rc4-1.1
 - rebuild
 

net-snmpd.init

@@ -12,7 +12,12 @@
 # source function library
 . /etc/init.d/functions
 
-OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd -a"
+if [ -e /etc/snmp/snmpd.options ]; then
+  . /etc/snmp/snmpd.options
+else
+   OPTIONS="-Lsd -Lf /dev/null -p /var/run/snmpd -a"
+fi
+
 RETVAL=0
 prog="snmpd"
 

net-snmptrapd.init

@@ -13,9 +13,12 @@
 # source function library
 . /etc/init.d/functions
 
-[ -e /etc/snmp/snmptrapd.options ] && . /etc/snmp/snmptrapd.options
+if [ -e /etc/snmp/snmptrapd.options ]; then
+  . /etc/snmp/snmptrapd.options
+else
+   OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
+fi
 
-OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 RETVAL=0
 prog="snmptrapd"