[clamav/el6] Ensure that a clamd and clamav-milter condrestart via initscript works (#1018312, thanks to Filippo
Robert Scheck
robert at fedoraproject.org
Sat Oct 19 12:18:56 UTC 2013
commit c4cf2b1e61514556e725ec8990e063b89a099008
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sat Oct 19 14:18:35 2013 +0200
Ensure that a clamd and clamav-milter condrestart via initscript works (#1018312, thanks to Filippo Carletti)
clamav-milter.init | 2 +-
clamav.init | 3 +--
clamav.spec | 2 ++
3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/clamav-milter.init b/clamav-milter.init
index 347fe4b..d9fb037 100644
--- a/clamav-milter.init
+++ b/clamav-milter.init
@@ -47,7 +47,7 @@ case "$1" in
RETVAL=$?
;;
condrestart)
- [ -e /var/lock/subsys/clamd ] && restart
+ [ -e /var/lock/subsys/clamav-milter ] && $0 restart
RETVAL=$?
;;
*)
diff --git a/clamav.init b/clamav.init
index b2eb0c6..dacb403 100755
--- a/clamav.init
+++ b/clamav.init
@@ -46,7 +46,7 @@ case "$1" in
RETVAL=$?
;;
condrestart)
- [ -e /var/lock/subsys/clamd ] && restart
+ [ -e /var/lock/subsys/clamd ] && $0 restart
RETVAL=$?
;;
*)
@@ -55,4 +55,3 @@ case "$1" in
esac
exit $RETVAL
-
diff --git a/clamav.spec b/clamav.spec
index 1ec0861..555b18f 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -398,6 +398,8 @@ rm -rf %{buildroot}
* Sat Oct 19 2013 Robert Scheck <robert at fedoraproject.org> - 0.98-2
- Really fix all discrepancies between clamd initscript and clamd
config file (#960923, thanks to John Horne)
+- Ensure that a clamd and clamav-milter condrestart via initscript
+ works (#1018312, thanks to Filippo Carletti)
* Sun Oct 06 2013 Robert Scheck <robert at fedoraproject.org> - 0.98-1
- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168)
More information about the scm-commits
mailing list