===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.563
retrieving revision 1.564
diff -c -r1.563 -r1.564
*** src/etc/rc	2022/07/28 16:06:04	1.563
--- src/etc/rc	2022/08/29 11:51:05	1.564
***************
*** 1,4 ****
! #	$OpenBSD: rc,v 1.563 2022/07/28 16:06:04 miod 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.564 2022/08/29 11:51:05 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
***************
*** 448,453 ****
--- 448,454 ----
  
  mount -s /var >/dev/null 2>&1		# cannot be on NFS
  mount -s /var/log >/dev/null 2>&1	# cannot be on NFS
+ mount -s /usr >/dev/null 2>&1		# if NFS, fstab must use IP address
  
  start_daemon slaacd dhcpleased resolvd >/dev/null 2>&1
  
***************
*** 458,465 ****
  ifconfig -g carp carpdemote 128
  
  sh /etc/netstart
- 
- mount -s /usr >/dev/null 2>&1
  
  start_daemon unwind >/dev/null 2>&1
  
--- 459,464 ----