From 20b0c2671a292d0431f664239c5f946cde668a45 Mon Sep 17 00:00:00 2001
From: robert <>
Date: Fri, 8 Jul 2011 00:50:09 +0000
Subject: [PATCH] switch pflogd to rc.d

---
 src/etc/Makefile    |  4 ++--
 src/etc/rc          |  6 ++----
 src/etc/rc.d/pflogd | 11 +++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 src/etc/rc.d/pflogd

diff --git a/src/etc/Makefile b/src/etc/Makefile
index a39892b6..a2dd7eae 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.303 2011/07/07 23:29:45 robert Exp $
+#	$OpenBSD: Makefile,v 1.304 2011/07/08 00:50:09 robert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -33,7 +33,7 @@ BIN2=	motd
 # -r-xr-xr-x
 RCDAEMONS=	apmd aucat bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd ftpd  \
 		ftpproxy hostapd hotplugd httpd identd ifstated iked inetd isakmpd \
-		ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \
+		ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap pflogd \
 		rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \
 		sendmail sensorsd smtpd snmpd spamd sshd syslogd watchdogd wsmoused \
 		xdm ypbind ypldap yppasswdd ypserv
diff --git a/src/etc/rc b/src/etc/rc
index 1feea5a7..2a1a208f 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.369 2011/07/08 00:17:15 robert Exp $
+#	$OpenBSD: rc,v 1.370 2011/07/08 00:50:09 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -359,9 +359,7 @@ if [ X"${pf}" != X"NO" ]; then
 	ifconfig pflog0 create >/dev/null 2>&1
 	if ifconfig pflog0 >/dev/null 2>&1; then
 		ifconfig pflog0 up
-		if [ X"${pflogd_flags}" != X"NO" ]; then
-			pflogd ${pflogd_flags}
-		fi
+		start_daemon pflogd
 	fi
 fi
 
diff --git a/src/etc/rc.d/pflogd b/src/etc/rc.d/pflogd
new file mode 100644
index 00000000..0c4be02a
--- /dev/null
+++ b/src/etc/rc.d/pflogd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: pflogd,v 1.1 2011/07/08 00:50:09 robert Exp $
+
+daemon="/sbin/pflogd"
+
+. /etc/rc.d/rc.subr
+
+pexp="pflogd: \[priv\]"
+
+rc_cmd $1