[gentoo-commits] gentoo-x86 commit in mail-filter/MailScanner/files: initd.mailscanner

[gentoo-commits] gentoo-x86 commit in mail-filter/MailScanner/files: initd.mailscanner

[Patrick Lauer (patrick)]

patrick     10/03/16 19:28:31

  Modified:             initd.mailscanner
  Log:
  Making init script start/stop work properly
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  mail-filter/MailScanner/files/initd.mailscanner

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/MailScanner/files/initd.mailscanner?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/MailScanner/files/initd.mailscanner?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/MailScanner/files/initd.mailscanner?r1=1.1&r2=1.2

Index: initd.mailscanner
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/MailScanner/files/initd.mailscanner,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- initd.mailscanner	20 Mar 2008 15:34:15 -0000	1.1
+++ initd.mailscanner	16 Mar 2010 19:28:31 -0000	1.2
@@ -9,7 +9,11 @@
 
 start() {
 	ebegin "Starting MailScanner"
-	/usr/sbin/check_MailScanner >/dev/null
+	#/usr/sbin/check_MailScanner >/dev/null
+	start-stop-daemon --start --pidfile /var/run/${SVCNAME}.pid \
+		--exec /usr/sbin/MailScanner -- /etc/MailScanner/MailScanner.conf ${OPT} > /var/run/${SVCNAME}.pid
+        eend $?
+
 	RETVAL=$?
 	[ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner
 	[ ${RETVAL} -eq 0 ] && rm -f /var/lock/subsys/MailScanner.off
@@ -18,7 +22,7 @@
 
 stop() {
 	ebegin "Stopping MailScanner"
-	killall -15 MailScanner
+	start-stop-daemon --stop --quiet --pidfile /var/run/${SVCNAME}.pid
 	RETVAL=$?
 	[ ${RETVAL} -eq 0 ] && rm -f /var/lock/subsys/MailScanner
 	[ ${RETVAL} -eq 0 ] && touch /var/lock/subsys/MailScanner.off