From 1e7ff0c0ba1d8fc57dd3bc3d49be72f4c7d28abc Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Tue, 3 Jul 2001 03:28:19 +0000
Subject: [PATCH] pull in rc.conf early so that pf(1) startup is right; tested
 by jasoni, comments from millert

---
 src/etc/netstart | 5 +----
 src/etc/rc       | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index 7cef40fc..ad10a0f9 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.78 2001/05/30 02:11:08 deraadt Exp $
+#	$OpenBSD: netstart,v 1.79 2001/07/03 03:28:19 deraadt Exp $
 
 # Returns true if $1 contains only alphanumerics
 isalphanumeric() {
@@ -24,9 +24,6 @@ if [ -f /etc/defaultdomain ]; then
 	domainname `cat /etc/defaultdomain`
 fi
 
-# pick up option configuration
-. /etc/rc.conf
-
 # set the address for the loopback interface
 # it will also initialize IPv6 address for lo0 (::1 and others).
 ifconfig lo0 inet localhost
diff --git a/src/etc/rc b/src/etc/rc
index 19c5c8ff..39508df3 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.176 2001/07/01 08:38:59 kjell Exp $
+#	$OpenBSD: rc,v 1.177 2001/07/03 03:28:19 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -109,6 +109,9 @@ mount -a -t nonfs
 mount -uw /		# root on nfs requires this, others aren't hurt
 rm -f /fastboot		# XXX (root now writeable)
 
+# pick up option configuration
+. /etc/rc.conf
+
 # set flags on ttys.  (do early, in case they use tty for SLIP in netstart)
 echo 'setting tty flags'
 ttyflags -a