[sendmail/f15] Dropped reload action from initscripts Resolves: rhbz#719931
Jaroslav Škarvada
jskarvad at fedoraproject.org
Fri Jul 22 10:06:24 UTC 2011
commit c203585f69cc25b8f2e60af65b9eee59bb95f068
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri Jul 22 12:06:07 2011 +0200
Dropped reload action from initscripts
Resolves: rhbz#719931
sendmail.init | 20 --------------------
sendmail.nm-dispatcher | 2 +-
sendmail.spec | 6 +++++-
3 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/sendmail.init b/sendmail.init
index 851eb2b..fefd287 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -86,21 +86,6 @@ start() {
[ $ret -eq 0 ] && return 0 || return 1
}
-reload() {
- updateconf
- echo -n $"Reloading $prog: "
- killproc sendmail -HUP
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 -a -f /var/run/sm-client.pid ]; then
- echo -n $"reloading sm-client: "
- killproc sm-client -HUP
- RETVAL=$?
- echo
- fi
- return $RETVAL
-}
-
stop() {
# Stop daemons.
if [ -f /var/run/sm-client.pid ]; then
@@ -134,11 +119,6 @@ case "$1" in
stop
RETVAL=$?
;;
- reload)
- [ $running -eq 0 ] || exit 7
- reload
- RETVAL=$?
- ;;
restart|force-reload)
stop
start
diff --git a/sendmail.nm-dispatcher b/sendmail.nm-dispatcher
index 75dceb9..78b9315 100644
--- a/sendmail.nm-dispatcher
+++ b/sendmail.nm-dispatcher
@@ -2,6 +2,6 @@
case "$2" in
up|down|vpn-up|vpn-down)
- /sbin/service sendmail reload || :
+ /sbin/service sendmail restart || :
;;
esac
diff --git a/sendmail.spec b/sendmail.spec
index 3a10942..e9886e6 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,7 +14,7 @@
Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail
Version: 8.14.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Sendmail
Group: System Environment/Daemons
URL: http://www.sendmail.org/
@@ -645,6 +645,10 @@ exit 0
%changelog
+* Fri Jul 22 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.5-2
+- Dropped reload action from initscripts
+ Resolves: rhbz#719931
+
* Tue May 17 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.5-1
- New version 8.14.5
- Removed m4-ldap-routing, milter-fix-negativeid, man-i-option-fix
More information about the scm-commits
mailing list