===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.504
retrieving revision 1.505
diff -c -r1.504 -r1.505
*** src/etc/rc	2017/06/22 16:03:36	1.504
--- src/etc/rc	2017/06/27 03:42:00	1.505
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.504 2017/06/22 16:03:36 deraadt 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.505 2017/06/27 03:42:00 tedu 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
***************
*** 381,387 ****
  
  rm -f /fastboot
  
! # Set flags on ttys. (Do early, in case they use tty for SLIP in netstart.)
  echo 'setting tty flags'
  ttyflags -a
  
--- 381,387 ----
  
  rm -f /fastboot
  
! # Set flags on ttys.
  echo 'setting tty flags'
  ttyflags -a
  
***************
*** 433,444 ****
  # Set carp interlock by increasing the demotion counter.
  # Prevents carp from preempting until the system is booted.
  ifconfig -g carp carpdemote 128
- 
- # Recover resolv.conf in case dhclient died hard.
- if [[ -f /etc/resolv.conf.save ]]; then
- 	mv -f /etc/resolv.conf.save /etc/resolv.conf
- 	touch /etc/resolv.conf
- fi
  
  sh /etc/netstart
  
--- 433,438 ----