From 94110695a6c4743e1ca4db83ff53c5ea884974f0 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Mon, 29 Oct 2001 18:16:23 +0000
Subject: [PATCH] Change when calendar(1) is such so that it is after mailq
 runs. That way we avoid a flurry of transient calendar mail in the mailq.

---
 src/etc/daily | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/etc/daily b/src/etc/daily
index 0cc41264..785b734a 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: daily,v 1.37 2001/10/24 11:32:13 espie Exp $
+#	$OpenBSD: daily,v 1.38 2001/10/29 18:16:23 millert Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@@ -113,19 +113,6 @@ fi
 	}
 }
 
-echo ""
-if [ -d /var/yp/binding -a ! -d /var/yp/`domainname` -o "X$CALENDAR" = X0 ]
-then
-	if [ "X$CALENDAR" = X0 ]; then
-		echo "Not running calendar, (disabled)."
-	else
-		echo "Not running calendar, (yp client)."
-	fi
-else
-	echo "Running calendar in the background."
-	calendar -a &
-fi
-
 # Rotation of mail log now handled automatically by cron and 'newsyslog'
 
 echo ""
@@ -155,6 +142,19 @@ if [ "$t" != '/var/rwho/*' ]; then
 	ruptime
 fi
 
+echo ""
+if [ -d /var/yp/binding -a ! -d /var/yp/`domainname` -o "X$CALENDAR" = X0 ]
+then
+	if [ "X$CALENDAR" = X0 ]; then
+		echo "Not running calendar, (disabled)."
+	else
+		echo "Not running calendar, (yp client)."
+	fi
+else
+	echo "Running calendar in the background."
+	calendar -a &
+fi
+
 # If CHECKFILESYSTEMS is set to 1 in the environment, run fsck
 # with the no-write flag.
 [ "X$CHECKFILESYSTEMS" = X1 ] && {