Don't tell nagios about deleted printers

[moira.git] / gen / mailhub.sh

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index 1e128148d81ed91a00f3e4b527885d5d6fd3094c..db980351419fdf1e4041b4439dd59b339a989b1e 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -34,7 +34,7 @@ fi
 olines=`wc -l $root/etc/aliases |  awk '{print $1}'`
 nlines=`wc -l $root/etc/aliases.new | awk '{print $1}'`
 diff=`expr $nlines - $olines`
-thresh=`expr $nlines / 10`
+thresh=`expr $olines / 10`
 
 # Catch the zero case
 if [ $nlines -eq 0 ]; then
@@ -55,8 +55,7 @@ if [ $? != 0 ]; then
     exit $MR_MKCRED
 fi
 
-kill `ps -ef | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $2}'`
-sleep 60
+sh /etc/init.d/sendmail stop
 
 mv $root/etc/aliases $root/etc/aliases.old
 mv $root/etc/aliases.db $root/etc/aliases.old.db