===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/daily,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/etc/daily	2009/05/10 19:27:25	1.59
--- src/etc/daily	2009/05/11 22:27:22	1.60
***************
*** 1,5 ****
  #
! #	$OpenBSD: daily,v 1.59 2009/05/10 19:27:25 schwarze Exp $
  #	From: @(#)daily	8.2 (Berkeley) 1/25/94
  #
  umask 022
--- 1,5 ----
  #
! #	$OpenBSD: daily,v 1.60 2009/05/11 22:27:22 schwarze Exp $
  #	From: @(#)daily	8.2 (Berkeley) 1/25/94
  #
  umask 022
***************
*** 11,20 ****
  install -o 0 -g 0 -m 600    /dev/null $PARTOUT
  install -o 0 -g 0 -m 600 -b /dev/null $MAINOUT
  
- exec > $MAINOUT 2>&1
- sysctl -n kern.version
- uptime
- 
  start_part() {
  	TITLE=$1
  	exec > $PARTOUT 2>&1
--- 11,16 ----
***************
*** 110,122 ****
  	}
  }
  
! 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:"
--- 106,123 ----
  	}
  }
  
! next_part "Checking system status:"
! if [ "X$VERBOSESTATUS" != X0 ]; then
! 	sysctl -n kern.version
! 	uptime
  
+ 	echo ""
+ 	echo "disks:"
+ 	df -kl
+ 	echo ""
+ 	dump W
+ fi
+ 
  # The first two regular expressions handle sendmail, the third postfix.
  # When the queue is empty, exim -bp keeps silent.
  next_part "mail:"
***************
*** 125,136 ****
  		-e "^Mail queue is empty$"
  
  next_part "network:"
! netstat -ivn
  
! t=/var/rwho/*
! if [ "$t" != '/var/rwho/*' ]; then
! 	echo ""
! 	ruptime
  fi
  
  next_part "Running calendar in the background:"
--- 126,139 ----
  		-e "^Mail queue is empty$"
  
  next_part "network:"
! if [ "X$VERBOSESTATUS" != X0 ]; then
! 	netstat -ivn
  
! 	t=/var/rwho/*
! 	if [ "$t" != '/var/rwho/*' ]; then
! 		echo ""
! 		ruptime
! 	fi
  fi
  
  next_part "Running calendar in the background:"