Attachment 513384 Details for Bug 722485 – Get rid of "-p pid" from clamd-wrapper

[patch] Get rid of "-p pid" from clamd-wrapper

patch.diff (text/plain), 1.07 KB, created by angerman on 2011-07-15 13:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: angerman

Created: 2011-07-15 13:52:06 UTC

Size: 1.07 KB

patch

obsolete

>--- clamd-wrapper.org	2011-07-15 12:56:20.000000000 +0200
>+++ clamd-wrapper	2011-07-15 13:50:24.000000000 +0200
>@@ -41,8 +41,7 @@
> 
> start () {
> 	echo -n $"Starting $prog: "
>-	daemon --pidfile=${CLAMD_PIDFILE} \
>-	    exec -a $procname /usr/sbin/clamd \
>+	daemon /usr/sbin/clamd \
> 	    ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE}
> 	RETVAL=$?
> 	echo
>@@ -52,7 +51,7 @@
> 
> stop () {
> 	echo -n $"Stopping $prog: "
>-	killproc -p ${CLAMD_PIDFILE} $procname
>+	killproc $procname
> 	RETVAL=$?
> 	echo
> 	[ $RETVAL -eq 0 ] && rm -f $lockfile
>@@ -62,10 +61,10 @@
> reload() {
> 	rc=0
> 	echo -n $"Reloading $prog: "
>-	killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP  || rc=$?
>+	killproc $procname -SIGHUP  || rc=$?
> 	echo
> 	echo -n $"Loading new virus-database: "
>-	killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$?
>+	killproc $procname -SIGUSR2 || rc=$?
> 	echo
> 	return $rc
> }
>@@ -80,7 +79,7 @@
>   start|stop|restart|reload)
> 	$1 ;;
>   status)
>-	status -p ${CLAMD_PIDFILE} $procname ;;
>+	status  $procname ;;
>   condrestart)
> 	test ! -f $lockfile || restart
> 	;;

Actions: View | Diff

Attachments on bug 722485: 513384