Author: vangyzen
Date: Sun Nov 11 00:39:20 2018
New Revision: 340345
URL: https://svnweb.freebsd.org/changeset/base/340345
Log:
Fix daily mailq script for Postfix and daily_show_success="NO"
Exit with a zero status when Postfix reports "Mail queue is empty" so this
section won't appear in the report at all when daily_show_success="NO".
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/usr.sbin/periodic/etc/daily/440.status-mailq
Modified: head/usr.sbin/periodic/etc/daily/440.status-mailq
==============================================================================
--- head/usr.sbin/periodic/etc/daily/440.status-mailq Sun Nov 11 00:21:28
2018 (r340344)
+++ head/usr.sbin/periodic/etc/daily/440.status-mailq Sun Nov 11 00:39:20
2018 (r340345)
@@ -33,7 +33,7 @@ case "$daily_status_mailq_enable" in
*)
mailq;;
esac | tee /dev/stderr |
- egrep -v '(mqueue is empty|Total requests)' | wc -l)
+ egrep -v '((Mail |m)queue is empty|Total requests)' | wc -l)
[ $rc -gt 0 ] && rc=1 || rc=0
case "$daily_status_include_submit_mailq" in
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
