move the pflog0 setup to the pflogd script and only

do that if pf is actually enabled (rely on pfctl -si)

requested by deraadt@

1 files changed, 2 insertions, 11 deletions

diff --git a/etc/rc b/etc/rc
index 67ef220bf57..086b62ac10b 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.380 2011/07/08 16:20:13 ajacoutot Exp $
+#	$OpenBSD: rc,v 1.381 2011/07/08 21:42:52 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -415,16 +415,7 @@ dmesg >/var/run/dmesg.boot
 make_keys
 
 echo -n 'starting early daemons:'
-start_daemon syslogd ldattach
-
-if [ X"${pf}" != X"NO" ]; then
-	ifconfig pflog0 create >/dev/null 2>&1
-	if ifconfig pflog0 >/dev/null 2>&1; then
-		ifconfig pflog0 up
-		start_daemon pflogd
-	fi
-fi
-
+start_daemon syslogd ldattach pflogd
 start_daemon named nsd ntpd isakmpd iked sasyncd
 echo '.'