diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
| commit | ff87b5d1477fd150ff715e5c3c2a205deb66804f (patch) | |
| tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /etc | |
| parent | 62bb1062226d3ce6a2350808256a25508978352d (diff) | |
| parent | 4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff) | |
| download | FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz | |
Merge head
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/libmap32.conf | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 4 | ||||
| -rwxr-xr-x | etc/rc.d/ipfilter | 6 | ||||
| -rwxr-xr-x | etc/rc.d/ipfs | 2 | ||||
| -rwxr-xr-x | etc/rc.d/ipmon | 2 |
6 files changed, 14 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile index 6e2a716..ae52d79 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -50,6 +50,10 @@ BIN1= crontab \ syslog.conf \ termcap.small +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" +BIN1+= libmap32.conf +.endif + .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys) diff --git a/etc/libmap32.conf b/etc/libmap32.conf new file mode 100644 index 0000000..07fb138 --- /dev/null +++ b/etc/libmap32.conf @@ -0,0 +1,2 @@ +# $FreeBSD$ +/usr/lib/private /usr/lib32/private diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 636a5d2..c06d3e1 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -24,12 +24,16 @@ .. i18n .. + private + .. .. lib32 dtrace .. i18n .. + private + .. .. libdata gcc diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter index ec8e2f1..d540a6f 100755 --- a/etc/rc.d/ipfilter +++ b/etc/rc.d/ipfilter @@ -29,7 +29,7 @@ required_modules="ipl:ipfilter" ipfilter_start() { echo "Enabling ipfilter." - if [ `sysctl -n net.inet.ipf.fr_running` -le 0 ]; then + if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then ${ipfilter_program:-/sbin/ipf} -E fi ${ipfilter_program:-/sbin/ipf} -Fa @@ -37,7 +37,6 @@ ipfilter_start() ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -Fa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} @@ -46,8 +45,7 @@ ipfilter_start() ipfilter_stop() { - # XXX - The ipf -D command is not effective for 'lkm's - if [ `sysctl -n net.inet.ipf.fr_running` -eq 1 ]; then + if ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes'; then echo "Saving firewall state tables" ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags} echo "Disabling ipfilter." diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs index ff4c74d..ac6d5c2 100755 --- a/etc/rc.d/ipfs +++ b/etc/rc.d/ipfs @@ -23,7 +23,7 @@ ipfs_prestart() if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then err 1 "${name} requires either ipfilter or ipnat enabled" fi - if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then + if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes' >/dev/null 2>&1; then err 1 "ipfilter module is not loaded" fi return 0 diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon index 27f483c..cdd8742 100755 --- a/etc/rc.d/ipmon +++ b/etc/rc.d/ipmon @@ -23,7 +23,7 @@ ipmon_precmd() if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then err 1 "${name} requires either ipfilter or ipnat enabled" fi - if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then + if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes' >/dev/null 2>&1; then err 1 "ipfilter module is not loaded" fi return 0 |
