mount /usr earlier, to satisfy dynamically-linked daemons in /sbin better

(there will be more soon)

diff --git a/etc/rc b/etc/rc
index c999636..ad7e246 100644 (file)
--- 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