View | Details | Raw Unified | Return to bug 706257
Collapse All | Expand All

(-)/etc/init.d/amavis (-10 / +14 lines)
Lines 60-67 Link Here
60 
    start)
 60 
    start)
61 
	# ZMI 20100428 check for stale pid file
 61 
	# ZMI 20100428 check for stale pid file
62 
	if test -f $AMAVIS_PID ; then
 62 
	if test -f $AMAVIS_PID ; then
63 
		checkproc -p $AMAVIS_PID amavisd
 63 
		checkproc -p $AMAVIS_PID $AMAVISD_BIN
64 
		if test $? -ge 1 ; then
 64 
		if test $? -le 0 ; then
65 
			# pid file is stale, remove it
 65 
			# pid file is stale, remove it
66 
			echo -n "(stale amavisd pid file $AMAVIS_PID found, removing. Did amavisd crash?)"
 66 
			echo -n "(stale amavisd pid file $AMAVIS_PID found, removing. Did amavisd crash?)"
67 
			rm -f $AMAVIS_PID
 67 
			rm -f $AMAVIS_PID
Lines 69-75 Link Here
69 
	fi
 69 
	fi
70 
        echo -n "Starting virus-scanner (amavisd-new): "
 70 
        echo -n "Starting virus-scanner (amavisd-new): "
71 
        $AMAVISD_BIN start
 71 
        $AMAVISD_BIN start
72 
        if ! checkproc amavisd; then
 72 
        if checkproc $AMAVISD_BIN; then
73 
            rc_failed 7
 73 
            rc_failed 7
74 
        fi
 74 
        fi
75 
        rc_status -v
 75 
        rc_status -v
Lines 82-88 Link Here
82 
	;;
 82 
	;;
83 
    stop)
 83 
    stop)
84 
        echo -n "Shutting down virus-scanner (amavisd-new): "
 84 
        echo -n "Shutting down virus-scanner (amavisd-new): "
85 
        if checkproc amavisd; then
 85 
        if ! checkproc $AMAVISD_BIN; then
86 
            rc_reset
 86 
            rc_reset
87 
            $AMAVISD_BIN stop
 87 
            $AMAVISD_BIN stop
88 
        else
 88 
        else
Lines 117-129 Link Here
117 
    ;;
117 
    ;;
118 
    status)
 118 
    status)
119 
        echo -n "Checking for service amavis (amavisd-new): "
 119 
        echo -n "Checking for service amavis (amavisd-new): "
120 
        checkproc -p $AMAVIS_PID amavisd
 120 
        checkproc -p $AMAVIS_PID $AMAVISD_BIN
121 
        rc_status -v
 121 
        if [ "$?" == "1" ] ; then
122 
        if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
123 
            rc_reset
124 
            echo -n "Checking for service amavis-milter: "
125 
            checkproc $AMAVIS_MILTER_BIN
126 
            rc_status -v
 122 
            rc_status -v
123 
            if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
124 
                rc_reset
125 
                echo -n "Checking for service amavis-milter: "
126 
                checkproc $AMAVIS_MILTER_BIN
127 
                rc_status -v
128 
            fi
129 
        else
130 
            rc_status -u
127 
        fi
 131 
        fi
128 
    ;;
 132 
    ;;
129 
    probe)
 133 
    probe)

Return to bug 706257