rpms/net-snmp/devel net-snmp.spec, 1.195, 1.196 net-snmptrapd.init, 1.6, 1.7

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2926

Modified Files:
	net-snmp.spec net-snmptrapd.init 
Log Message:
fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- net-snmp.spec	2 Dec 2009 09:33:22 -0000	1.195
+++ net-snmp.spec	3 Dec 2009 14:28:20 -0000	1.196
@@ -403,6 +403,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Wed Dec  2 2009 Jan Safranek <jsafrane at redhat.com> 1:5.5-4
 - fix udpTable indexes on big-endian systems (#543352)
+- fix snmptrapd init script to survive with empty /etc/sysconfig/snmptrapd
 
 * Wed Nov 25 2009 Jan Safranek <jsafrane at redhat.com>  1:5.5-3
 - prepare the .spec file for review


Index: net-snmptrapd.init
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmptrapd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- net-snmptrapd.init	25 Nov 2009 15:22:55 -0000	1.6
+++ net-snmptrapd.init	3 Dec 2009 14:28:21 -0000	1.7
@@ -26,10 +26,9 @@
 # source function library
 . /etc/init.d/functions
 
+OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 if [ -e /etc/sysconfig/snmptrapd ]; then
   . /etc/sysconfig/snmptrapd
-else
-   OPTIONS="-Lsd -p /var/run/snmptrapd.pid"
 fi
 
 RETVAL=0