diff options
| author | Robert Nagy <robert@cvs.openbsd.org> | 2011-07-08 00:50:10 +0000 |
|---|---|---|
| committer | Robert Nagy <robert@cvs.openbsd.org> | 2011-07-08 00:50:10 +0000 |
| commit | b04e2f825998b698dfdefb27ee6279bd812fcca9 (patch) | |
| tree | 898b04e889dd771d8813d6459120e5ea503e6427 | |
| parent | 9f0b16569b619a1664b2495fc378cc523aeee28d (diff) | |
switch pflogd to rc.d
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.d/pflogd | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index a39892b6ad4..a2dd7eaedc2 100644 --- a/etc/Makefile +++ b/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 @@ -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/etc/rc.d/pflogd b/etc/rc.d/pflogd new file mode 100644 index 00000000000..0c4be02a318 --- /dev/null +++ b/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 |