fix makefile bug

[moira.git] / gen / mailhub.sh

diff --git a/gen/mailhub.sh b/gen/mailhub.sh
index f607da570e6b8a952f18037571aa83f9e39a2c75..4509b7b2cad9008ec20d0be83af3d5b171e20836 100644 (file)
--- a/gen/mailhub.sh
+++ b/gen/mailhub.sh
@@ -3,22 +3,34 @@ PATH=/bin:/usr/ucb:/usr/bin
 
 MR_MKCRED=47836474
 
-cat /usr/lib/local-aliases >> /u1/usr/lib/aliases.new
-cp /dev/null /u1/usr/lib/aliases.new.dir
-cp /dev/null /u1/usr/lib/aliases.new.pag
-/usr/lib/sendmail -bi -oA/u1/usr/lib/aliases.new
+cat /usr/lib/aliases.legacy > /usr/lib/aliases.tmp
+cat /usr/lib/aliases.new >> /usr/lib/aliases.tmp
+cat /usr/lib/aliases.local >> /usr/lib/aliases.tmp
+mv aliases.tmp aliases.new
+
+cp /dev/null /usr/lib/aliases.new.dir
+cp /dev/null /usr/lib/aliases.new.pag
+
+/usr/lib/sendmail -bi -oA/usr/lib/aliases.new
 if [ $? != 0 ]; then
        exit $MR_MKCRED
        fi
 
-kill `ps ax | grep "accepting connections" | grep -v grep | awk '{print $1}'`
-mv /u1/usr/lib/aliases /u1/usr/lib/aliases.old
-mv /u1/usr/lib/aliases.dir /u1/usr/lib/aliases.old.dir
-mv /u1/usr/lib/aliases.pag /u1/usr/lib/aliases.old.pag
-mv /u1/usr/lib/aliases.new /u1/usr/lib/aliases
-mv /u1/usr/lib/aliases.new.dir /u1/usr/lib/aliases.dir
-mv /u1/usr/lib/aliases.new.pag /u1/usr/lib/aliases.pag
-/usr/lib/sendmail -bd -q30m
+kill `ps ax | grep "sendmail" | egrep -v "grep|mqueue.stall" | awk '{print $1}'`
+sleep 60
+
+mv /usr/lib/aliases /usr/lib/aliases.old
+mv /usr/lib/aliases.dir /usr/lib/aliases.old.dir
+mv /usr/lib/aliases.pag /usr/lib/aliases.old.pag
+mv /usr/lib/aliases.new /usr/lib/aliases
+mv /usr/lib/aliases.new.dir /usr/lib/aliases.dir
+mv /usr/lib/aliases.new.pag /usr/lib/aliases.pag
+
+cd /usr/spool/mqueue
+rm -f xf* tf* lf* nf*
+
+/usr/lib/sendmail -bd
+/usr/lib/sendmail -q20m
 
 rm -f $0
 exit 0