From c5e229f62e1add74a95096956384c87847b01c09 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 11 Nov 2019 04:55:37 +0000
Subject: [PATCH] move /usr and var remounting (nfs diskless case...) earlier,
 so that unwind can be started (silently) before pf is configured (for those
 few weirdos who use hostnames in pf.conf...).  Other unidentified concerns
 may be improved by this startup re-ordering, so let's give it a try.
 discussed with florian.

---
 src/etc/rc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index f8a5c9b1..73303379 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.541 2019/11/10 15:02:36 naddy Exp $
+#	$OpenBSD: rc,v 1.542 2019/11/11 04:55:37 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
@@ -446,6 +446,11 @@ ifconfig -g carp carpdemote 128
 
 sh /etc/netstart
 
+mount -s /usr >/dev/null 2>&1
+mount -s /var >/dev/null 2>&1
+
+start_daemon unwind >/dev/null 2>&1
+
 # Load pf rules and bring up pfsync interface.
 if [[ $pf != NO ]]; then
 	if [[ -f /etc/pf.conf ]]; then
@@ -456,9 +461,6 @@ if [[ $pf != NO ]]; then
 	fi
 fi
 
-mount -s /usr >/dev/null 2>&1
-mount -s /var >/dev/null 2>&1
-
 random_seed
 
 reorder_libs
@@ -474,7 +476,7 @@ dmesg >/var/run/dmesg.boot
 make_keys
 
 echo -n 'starting early daemons:'
-start_daemon syslogd ldattach pflogd nsd rebound unwind unbound ntpd
+start_daemon syslogd ldattach pflogd nsd rebound unbound ntpd
 start_daemon iscsid isakmpd iked sasyncd ldapd npppd
 echo '.'