diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-05-17 00:25:35 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2009-05-17 00:25:35 +0000 |
| commit | 3eddc861947165c6b564f5ea55495ad28029630f (patch) | |
| tree | 0a6fdd46a1514207c5448e54125e077e9aff88a2 /etc | |
| parent | b99080752280e056f83437dbd5c1f1eb016dcd9c (diff) | |
move kern.version and uptime back to the top of the output
by moving it down to the bottom of the code;
"I definitely like this" ajacoutot@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/daily | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/daily b/etc/daily index ede2bf4d4f4..3d7e8784514 100644 --- a/etc/daily +++ b/etc/daily @@ -1,5 +1,5 @@ # -# $OpenBSD: daily,v 1.60 2009/05/11 22:27:22 schwarze Exp $ +# $OpenBSD: daily,v 1.61 2009/05/17 00:25:34 schwarze Exp $ # From: @(#)daily 8.2 (Berkeley) 1/25/94 # umask 022 @@ -106,11 +106,8 @@ next_part "Backing up root filesystem:" } } -next_part "Checking system status:" +next_part "Checking subsystem status:" if [ "X$VERBOSESTATUS" != X0 ]; then - sysctl -n kern.version - uptime - echo "" echo "disks:" df -kl @@ -160,7 +157,11 @@ if [ -f /etc/Distfile ]; then fi end_part -[ -s $MAINOUT ] && mail -s "`hostname` daily output" root < $MAINOUT +[ -s $MAINOUT ] && { + sysctl -n kern.version + uptime + cat $MAINOUT +} 2>&1 | mail -s "`hostname` daily output" root MAINOUT=/var/log/security.out |