===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.266
retrieving revision 1.267
diff -c -r1.266 -r1.267
*** src/etc/rc	2005/05/18 16:43:51	1.266
--- src/etc/rc	2005/05/19 01:58:49	1.267
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.266 2005/05/18 16:43:51 millert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.267 2005/05/19 01:58:49 millert Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 52,57 ****
--- 52,59 ----
  }
  
  sysctl_conf() {
+ 	test -s /etc/sysctl.conf || return
+ 
  	# delete comments and blank lines
  	set -- `stripcom /etc/sysctl.conf`
  	while [ $# -ge 1 ] ; do
***************
*** 71,76 ****
--- 73,80 ----
  
  mixerctl_conf()
  {
+ 	test -s /etc/mixerctl.conf || return
+ 
  	# delete comments and blank lines
  	set -- `stripcom /etc/mixerctl.conf`
  	while [ $# -ge 1 ] ; do
***************
*** 79,84 ****
--- 83,104 ----
  	done
  }
  
+ wsconsctl_conf()
+ {
+ 	local save_IFS="$IFS"
+ 
+ 	test -x /sbin/wsconsctl -a -s /etc/wsconsctl.conf || return
+ 	# delete comments and blank lines
+ 	IFS="
+ "
+ 	set -- `stripcom /etc/wsconsctl.conf`
+ 	IFS="$save_IFS"
+ 	while [ $# -ge 1 ] ; do
+ 		eval /sbin/wsconsctl -w $1
+ 		shift
+ 	done
+ }
+ 
  # End subroutines
  
  stty status '^T'
***************
*** 217,229 ****
  	echo $RULES | pfctl -f - -e
  fi
  
! if [ -f /etc/sysctl.conf ]; then
! 	sysctl_conf
! fi
  
! if [ -f /etc/mixerctl.conf ]; then
! 	mixerctl_conf
! fi
  
  # set hostname, turn on network
  echo 'starting network'
--- 237,245 ----
  	echo $RULES | pfctl -f - -e
  fi
  
! sysctl_conf
  
! mixerctl_conf
  
  # set hostname, turn on network
  echo 'starting network'
***************
*** 670,689 ****
  
  echo '.'
  
! if [ -x /sbin/wsconsctl -a -f /etc/wsconsctl.conf ]; then
! (
! 	# delete comments and blank lines
! 	save_IFS="$IFS"
! 	IFS="
! "
! 	set -- `stripcom /etc/wsconsctl.conf`
! 	IFS="$save_IFS"
! 	while [ $# -ge 1 ] ; do
! 		eval /sbin/wsconsctl -w $1
! 		shift
! 	done
! )
! fi
  
  # KerberosV master KDC
  if [ X"${krb5_master_kdc}" = X"YES" ]; then
--- 686,692 ----
  
  echo '.'
  
! wsconsctl_conf
  
  # KerberosV master KDC
  if [ X"${krb5_master_kdc}" = X"YES" ]; then