===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.430
retrieving revision 1.431
diff -c -r1.430 -r1.431
*** src/etc/rc	2014/07/14 03:45:55	1.430
--- src/etc/rc	2014/07/14 09:04:02	1.431
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.430 2014/07/14 03:45:55 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
--- 1,4 ----
! #	$OpenBSD: rc,v 1.431 2014/07/14 09:04:02 deraadt Exp $
  
  # System startup script run by init on autoboot
  # or after single-user.
***************
*** 283,289 ****
  		fi
  
  		echo /etc/rc.shutdown in progress...
! 		[ -f /etc/rc.shutdown ] && . /etc/rc.shutdown
  		echo /etc/rc.shutdown complete.
  	else
  		echo single user: not running shutdown scripts
--- 283,289 ----
  		fi
  
  		echo /etc/rc.shutdown in progress...
! 		[ -f /etc/rc.shutdown ] && sh /etc/rc.shutdown
  		echo /etc/rc.shutdown complete.
  	else
  		echo single user: not running shutdown scripts
***************
*** 296,304 ****
  		esac
  	done
  
- 	if [ X"${powerdown}" = X"YES" ]; then
- 		exit 2
- 	fi
  	exit 0
  fi
  
--- 296,301 ----
***************
*** 460,470 ****
  
  setup_X_sockets
  
! [ -f /etc/rc.securelevel ] && . /etc/rc.securelevel
! if [ X"${securelevel}" != X"" ]; then
! 	echo -n 'setting kernel security level: '
! 	sysctl kern.securelevel=${securelevel}
! fi
  
  # patch /etc/motd
  if [ ! -f /etc/motd ]; then
--- 457,464 ----
  
  setup_X_sockets
  
! [ -f /etc/rc.securelevel ] && sh /etc/rc.securelevel
! sysctl kern.securelevel=1
  
  # patch /etc/motd
  if [ ! -f /etc/motd ]; then
***************
*** 537,543 ****
  	echo '.'
  fi
  
! [ -f /etc/rc.local ] && . /etc/rc.local
  
  ifconfig -g carp -carpdemote 128	# disable carp interlock
  
--- 531,537 ----
  	echo '.'
  fi
  
! [ -f /etc/rc.local ] && sh /etc/rc.local
  
  ifconfig -g carp -carpdemote 128	# disable carp interlock