rpms/net-snmp/devel net-snmp.spec, 1.79, 1.80 net-snmpd.init, 1.1, 1.2 net-snmptrapd.init, 1.2, 1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 12 12:32:26 UTC 2006


Author: rvokal

Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3497

Modified Files:
	net-snmp.spec net-snmpd.init net-snmptrapd.init 
Log Message:
- fix init script, read .options files from /etc/snmp (#195702)


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- net-snmp.spec	12 Jul 2006 07:26:55 -0000	1.79
+++ net-snmp.spec	12 Jul 2006 12:32:22 -0000	1.80
@@ -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 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Jul 12 2006 Radek Vokál <rvokal at redhat.com> 5.3.1.rc4-2
+- fix init script, read .options files from /etc/snmp (#195702)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.3.1.rc4-1.1
 - rebuild
 


Index: net-snmpd.init
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-snmpd.init	9 Sep 2004 09:10:41 -0000	1.1
+++ net-snmpd.init	12 Jul 2006 12:32:23 -0000	1.2
@@ -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"
 


Index: net-snmptrapd.init
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmptrapd.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net-snmptrapd.init	9 Sep 2004 09:13:26 -0000	1.2
+++ net-snmptrapd.init	12 Jul 2006 12:32:23 -0000	1.3
@@ -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"
 




More information about the fedora-cvs-commits mailing list