diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-10-29 18:16:24 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-10-29 18:16:24 +0000 |
| commit | 4feb42355f853fe85a9f0aefefa6f40dc4ef8ed0 (patch) | |
| tree | a49e8f60ac296c01e8868fb93240d1243f5f48b9 | |
| parent | a2a69d46ed22682b89e591b4ff93c7e982925596 (diff) | |
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.
| -rw-r--r-- | etc/daily | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/etc/daily b/etc/daily index 0cc41264ebc..785b734a0be 100644 --- a/etc/daily +++ b/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 ] && { |