[gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd

[Eray Aslan (eras)]

eras        12/01/10 13:46:47

  Modified:             amavisd.initd
  Log:
  don't try to parse the config file - bug #397763
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  mail-filter/amavisd-new/files/amavisd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.3&r2=1.4

Index: amavisd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- amavisd.initd	6 Jan 2012 11:38:35 -0000	1.3
+++ amavisd.initd	10 Jan 2012 13:46:47 -0000	1.4
@@ -1,14 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.4 2012/01/10 13:46:47 eras Exp $
 
 extra_started_commands="reload"
 extra_commands="debug debug_sa"
 
 prog="/usr/sbin/amavisd"
 progname="amavisd-new"
-conffile="/etc/amavisd.conf"
 
 depend() {
 	need net
@@ -16,23 +15,8 @@
 	before mta
 }
 
-checkconfig() {
-	local piddir pidfile
-	if [ -r "${conffile}" ] ; then
-		pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
-		piddir=${pidfile%/*}
-		if [ ! -d "${piddir:=/var/amavis}" ] ; then
-			checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
-		fi
-	else
-		eerror "Missing conf file."
-		return 1
-	fi
-}
-
 start() {
 	ebegin "Starting ${progname}"
-	checkconfig || return 1
 	"${prog}" start
 	eend $?
 }
@@ -59,14 +43,12 @@
 
 debug() {
 	ebegin "Starting ${progname} in debug mode"
-	checkconfig || return 1
 	"${prog}" debug
 	eend $?
 }
 
 debug_sa() {
 	ebegin "Starting ${progname} in debug-sa mode"
-	checkconfig || return 1
 	"${prog}" debug-sa
 	eend $?
 }