Hey Simon, are you going to commit this?
-Matt
Matthew Dillon
<dillon@backplane.com>
:thanks for your effort, though this is the wrong fix.
:
:correct one taken from freebsd rev 1.2: load pf, as it includes pflog now.
:
:<http://oly.corecode.ath.cx/~corecode/cgi-bin/crosscgi.py/changeset-240656.=
:diff?cmd=3Dchangeset&revid=3D240656>
:
:cheers
: simon
:
:=2D-=20
:/"\
:\ /
: \ ASCII Ribbon Campaign
:/ \ Against HTML Mail and News
:
:--Boundary-01=_/VVCCNlJCKgNJi6
:Content-Type: text/plain;
: charset="utf-8";
: name="changeset-240656.diff?cmd=changeset&revid=240656"
:Content-Transfer-Encoding: quoted-printable
:Content-Disposition: attachment;
: filename="changeset-240656.diff?cmd=changeset&revid=240656"
:
:Changeset for FreeBSD src/etc/rc.d/pflog 1.2
:Don't rely on properly setup linker.hints to figure out that pflog is now
:part of the pf module.
:While here fix a comment that was c'n'ped from rc.d/pf
:
:PR: bin/71096 (partly)
:Submitted by: Ville-Pertti Keinonen
:MFC after: 2 days
:
:Index: src/etc/rc.d/pflog
:diff -u src/etc/rc.d/pflog:1.1 src/etc/rc.d/pflog:1.2
:=2D-- src/etc/rc.d/pflog:1.1 Fri Apr 2 21:25:27 2004
:+++ src/etc/rc.d/pflog Tue Aug 31 16:23:51 2004
:@@ -1,6 +1,6 @@
: #!/bin/sh
: #
:=2D# $FreeBSD: src/etc/rc.d/pflog,v 1.1 2004/04/02 19:25:27 mlaier Exp $
:+# $FreeBSD: src/etc/rc.d/pflog,v 1.2 2004/08/31 14:23:51 mlaier Exp $
: #
:=20
: # PROVIDE: pflog
:@@ -27,7 +27,7 @@
: {
: # load pflog kernel module if needed
: if ! kldstat -v | grep -q pflog\$; then
:=2D if kldload pflog; then
:+ if kldload pf; then
: info 'pflog module loaded.'
: else
: err 1 'pflog module failed to load.'
:@@ -39,7 +39,7 @@
: warn 'pflog: COULD NOT SET UP pflog0'
: fi
:=20
:=2D # check for pf rules
:+ # check for pflogd binary
: if [ ! -x "${pflog_program:-/sbin/pflogd}" ]
: then
: warn 'pflog: NO PFLOGD BINARY FOUND'