re-introduce /etc/sysconfig files

Resolves: #752821
This commit is contained in:
Jan Safranek 2011-11-28 14:12:57 +01:00
parent a6d519fe77
commit f30e598936
5 changed files with 16 additions and 15 deletions

View File

@ -11,7 +11,7 @@
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.1 Version: 5.7.1
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -439,6 +439,8 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_localstatedir}/run/net-snmp %dir %{_localstatedir}/run/net-snmp
%config(noreplace) %{_sysconfdir}/tmpfiles.d/net-snmp.conf %config(noreplace) %{_sysconfdir}/tmpfiles.d/net-snmp.conf
%{_unitdir}/snmp* %{_unitdir}/snmp*
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
%files utils %files utils
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -505,10 +507,11 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root) %defattr(-,root,root)
%{_initrddir}/snmpd %{_initrddir}/snmpd
%{_initrddir}/snmptrapd %{_initrddir}/snmptrapd
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
%changelog %changelog
* Mon Nov 28 2011 Jan Safranek <jsafrane@redhat.com> - 1:5.7.1-3
- re-introduced /etc/sysconfig files (#752821)
* Wed Oct 5 2011 Jan Safranek <jsafrane@redhat.com> - 1:5.7.1-2 * Wed Oct 5 2011 Jan Safranek <jsafrane@redhat.com> - 1:5.7.1-2
- fixed perl linking (#742678) - fixed perl linking (#742678)

View File

@ -1,6 +1,3 @@
# WARNING:
# This file is only for compatibility with SysV init scripts if someone uses
# them! systemd does not use this file when starting snmpd!
#
# snmpd command line options # snmpd command line options
# OPTIONS="-LS0-6d -Lf /dev/null -p /var/run/snmpd.pid" # '-f' is implicitly added by snmpd systemd unit file
# OPTIONS="-LS0-6d"

View File

@ -1,6 +1,3 @@
# WARNING:
# This file is only for compatibility with SysV init scripts if someone uses
# them! systemd does not use this file when starting snmpd!
#
# snmptrapd command line options # snmptrapd command line options
# OPTIONS="-Lsd -p /var/run/snmptrapd.pid" # '-f' is implicitly added by snmptrapd systemd unit file
# OPTIONS="-Lsd"

View File

@ -4,7 +4,9 @@ After=syslog.target network.target
[Service] [Service]
Type=notify Type=notify
ExecStart=/usr/sbin/snmpd -LS0-6d -f Environment=OPTIONS="-LS0-6d"
EnvironmentFile=-/etc/sysconfig/snmpd
ExecStart=/usr/sbin/snmpd $OPTIONS -f
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install] [Install]

View File

@ -4,7 +4,9 @@ After=syslog.target network.target
[Service] [Service]
Type=notify Type=notify
ExecStart=/usr/sbin/snmptrapd -Lsd -f Environment=OPTIONS="-Lsd"
EnvironmentFile=-/etc/sysconfig/snmptrapd
ExecStart=/usr/sbin/snmptrapd $OPTIONS -f
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install] [Install]