From eb550c80236b0da6e162711ac8cbb7db09d979d1 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 29 Aug 2022 11:51:05 +0000
Subject: [PATCH] mount /usr earlier, to satisfy dynamically-linked daemons in
 /sbin better (there will be more soon)

---
 etc/rc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/etc/rc b/etc/rc
index c9996368c0c..ad7e246217f 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.563 2022/07/28 16:06:04 miod Exp $
+#	$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,6 +448,7 @@ sysctl_conf
 
 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
 
@@ -459,8 +460,6 @@ ifconfig -g carp carpdemote 128
 
 sh /etc/netstart
 
-mount -s /usr >/dev/null 2>&1
-
 start_daemon unwind >/dev/null 2>&1
 
 random_seed
-- 
2.20.1