From d9009d8e54215fe0c192ef69ee1d04f5f4d79aae Mon Sep 17 00:00:00 2001 From: schwarze <> Date: Sun, 10 May 2009 19:27:25 +0000 Subject: [PATCH] avoid unnecessary changes of the output in order not to annoy parser scripts and their owners (like henning@) --- src/etc/daily | 12 +++++++----- src/etc/monthly | 4 ++-- src/etc/weekly | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/etc/daily b/src/etc/daily index 92aa284d..7fc0bcb9 100644 --- a/src/etc/daily +++ b/src/etc/daily @@ -1,5 +1,5 @@ # -# $OpenBSD: daily,v 1.58 2009/05/09 17:15:49 schwarze Exp $ +# $OpenBSD: daily,v 1.59 2009/05/10 19:27:25 schwarze Exp $ # From: @(#)daily 8.2 (Berkeley) 1/25/94 # umask 022 @@ -44,7 +44,7 @@ run_script() { . $f } -start_part "Running /etc/daily.local:" +start_part "Running daily.local:" run_script "daily.local" next_part "Removing scratch and junk files:" @@ -110,19 +110,21 @@ next_part "Backing up root filesystem:" } } -next_part "Disk status:" +next_part "Checking subsystem status:" +echo "" +echo "disks:" df -kl echo "" dump W # The first two regular expressions handle sendmail, the third postfix. # When the queue is empty, exim -bp keeps silent. -next_part "Mail queue:" +next_part "mail:" mailq | grep -v -e "^/var/spool/mqueue is empty$" \ -e "^[[:blank:]]*Total requests: 0$" \ -e "^Mail queue is empty$" -next_part "Network status:" +next_part "network:" netstat -ivn t=/var/rwho/* diff --git a/src/etc/monthly b/src/etc/monthly index d21ee59f..38663498 100644 --- a/src/etc/monthly +++ b/src/etc/monthly @@ -1,5 +1,5 @@ # -# $OpenBSD: monthly,v 1.10 2009/05/09 17:15:49 schwarze Exp $ +# $OpenBSD: monthly,v 1.11 2009/05/10 19:27:25 schwarze Exp $ # umask 022 @@ -37,7 +37,7 @@ run_script() { . $f } -start_part "Running /etc/monthly.local:" +start_part "Running monthly.local:" run_script "monthly.local" end_part diff --git a/src/etc/weekly b/src/etc/weekly index ec22dcca..28ac1ebb 100644 --- a/src/etc/weekly +++ b/src/etc/weekly @@ -1,5 +1,5 @@ # -# $OpenBSD: weekly,v 1.20 2009/05/09 17:15:49 schwarze Exp $ +# $OpenBSD: weekly,v 1.21 2009/05/10 19:27:25 schwarze Exp $ # umask 022 @@ -40,7 +40,7 @@ run_script() { . $f } -start_part "Running /etc/weekly.local:" +start_part "Running weekly.local:" run_script "weekly.local" next_part "Rebuilding locate database:"