===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.451
retrieving revision 1.452
diff -c -r1.451 -r1.452
*** src/etc/rc	2015/07/18 00:37:23	1.451
--- src/etc/rc	2015/07/18 21:12:40	1.452
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.451 2015/07/18 00:37:23 rpe Exp $
  
  # System startup script run by init on autoboot or after single-user.
  # Output and error are redirected to console by init, and the console is the
--- 1,4 ----
! #	$OpenBSD: rc,v 1.452 2015/07/18 21:12:40 rpe Exp $
  
  # System startup script run by init on autoboot or after single-user.
  # Output and error are redirected to console by init, and the console is the
***************
*** 73,80 ****
  }
  
  # Apply mixerctl(1) settings.
! mixerctl_conf()
! {
  	test -s /etc/mixerctl.conf || return
  
  	# delete comments and blank lines
--- 73,79 ----
  }
  
  # Apply mixerctl(1) settings.
! mixerctl_conf() {
  	test -s /etc/mixerctl.conf || return
  
  	# delete comments and blank lines
***************
*** 86,93 ****
  }
  
  # Apply wscons system driver settings using wsconsctl(8).
! wsconsctl_conf()
! {
  	local save_IFS="$IFS"
  
  	test -x /sbin/wsconsctl -a -s /etc/wsconsctl.conf || return
--- 85,91 ----
  }
  
  # Apply wscons system driver settings using wsconsctl(8).
! wsconsctl_conf() {
  	local save_IFS="$IFS"
  
  	test -x /sbin/wsconsctl -a -s /etc/wsconsctl.conf || return
***************
*** 102,109 ****
  	done
  }
  
! random_seed()
! {
  	# push the old seed into the kernel
  	dd if=/var/db/host.random of=/dev/random bs=65536 count=1 status=none
  	chmod 600 /var/db/host.random
--- 100,106 ----
  	done
  }
  
! random_seed() {
  	# push the old seed into the kernel
  	dd if=/var/db/host.random of=/dev/random bs=65536 count=1 status=none
  	chmod 600 /var/db/host.random
***************
*** 117,124 ****
  # Populate net.inet.(tcp|udp).baddynamic with the contents of /etc/services so
  # as to avoid randomly allocating source ports that correspond to well-known
  # services.
! fill_baddynamic()
! {
  	local _service=$1
  	local _sysctl="net.inet.${_service}.baddynamic"
  	stripcom /etc/services |
--- 114,120 ----
  # Populate net.inet.(tcp|udp).baddynamic with the contents of /etc/services so
  # as to avoid randomly allocating source ports that correspond to well-known
  # services.
! fill_baddynamic() {
  	local _service=$1
  	local _sysctl="net.inet.${_service}.baddynamic"
  	stripcom /etc/services |
***************
*** 139,146 ****
  
  # Start daemon using the rc.d daemon control scripts.
  # Usage: start_daemon daemon1 daemon2 daemon3
! start_daemon()
! {
  	local _n
  	for _n; do
  		eval _do=\${${_n}_flags}
--- 135,141 ----
  
  # Start daemon using the rc.d daemon control scripts.
  # Usage: start_daemon daemon1 daemon2 daemon3
! start_daemon() {
  	local _n
  	for _n; do
  		eval _do=\${${_n}_flags}
***************
*** 151,158 ****
  }
  
  # Generate keys for isakmpd, iked and sshd if the don't exist yet.
! make_keys()
! {
  	if [ ! -f /etc/isakmpd/private/local.key ]; then
  		echo -n "openssl: generating isakmpd/iked RSA key... "
  		if openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
--- 146,152 ----
  }
  
  # Generate keys for isakmpd, iked and sshd if the don't exist yet.
! make_keys() {
  	if [ ! -f /etc/isakmpd/private/local.key ]; then
  		echo -n "openssl: generating isakmpd/iked RSA key... "
  		if openssl genrsa -out /etc/isakmpd/private/local.key 2048 \
***************
*** 179,186 ****
  
  # Create Unix sockets directories for X if needed and make sure they have
  # correct permissions.
! setup_X_sockets()
! {
  	if [ -d /usr/X11R6/lib ]; then
  		for d in /tmp/.X11-unix /tmp/.ICE-unix ; do
  			if [ -d $d ]; then
--- 173,179 ----
  
  # Create Unix sockets directories for X if needed and make sure they have
  # correct permissions.
! setup_X_sockets() {
  	if [ -d /usr/X11R6/lib ]; then
  		for d in /tmp/.X11-unix /tmp/.ICE-unix ; do
  			if [ -d $d ]; then
***************
*** 202,209 ****
  }
  
  # Check filesystems, optionally by using a flag for fsck(8) passed as $1.
! do_fsck()
! {
  	local _flags=$1
  
  	fsck -p $_flags
--- 195,201 ----
  }
  
  # Check filesystems, optionally by using a flag for fsck(8) passed as $1.
! do_fsck() {
  	local _flags=$1
  
  	fsck -p $_flags