Browse Source

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.
OPENBSD_3_1
millert 23 years ago
parent
commit
94110695a6
1 changed files with 14 additions and 14 deletions
  1. +14
    -14
      src/etc/daily

+ 14
- 14
src/etc/daily View File

@ -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 ] && {


Loading…
Cancel
Save