When run as root, tcpdump will chroot to /var/run/tcpdump - but it can

not look up /etc/protcols in there. So install a copy of /etc/protocols
into the chroot area.
Fixes PR bin/44721.
This commit is contained in:
martin 2011-04-11 20:03:45 +00:00
parent 2ca6f25dde
commit 75b76dfeb7
4 changed files with 10 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.221 2011/02/20 19:24:53 christos Exp $
# $NetBSD: mi,v 1.222 2011/04/11 20:03:45 martin Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@ -332,6 +332,7 @@
./root/.profile etc-root-root
./root/.shrc etc-root-root
./var/at/at.deny etc-cron-root
./var/chroot/tcpdump/etc/protocols etc-sys-etc
./var/crash/minfree etc-sys-root
./var/cron/tabs/root etc-cron-root
./var/db/locate.database etc-sys-root

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.387 2011/02/16 16:22:13 uebayasi Exp $
# $NetBSD: Makefile,v 1.388 2011/04/11 20:03:45 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@ -301,6 +301,9 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
${.CURDIR}/etc.${MACHINE}/boot.cfg ${DESTDIR}/
.endif
${_MKMSG_INSTALL} ${DESTDIR}/var/chroot/tcpdump/etc/protocols
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
protocols ${DESTDIR}/var/chroot/tcpdump/etc
${_MKMSG_INSTALL} ${DESTDIR}/dev/MAKEDEV
${ETC_INSTALL_OBJ_FILE} -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV ${DESTDIR}/dev

View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist.base,v 1.79 2011/03/24 17:05:42 bouyer Exp $
# $NetBSD: NetBSD.dist.base,v 1.80 2011/04/11 20:03:45 martin Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@ -1102,6 +1102,7 @@
./var/chroot/pflogd mode=0755
./var/chroot/sshd mode=0755
./var/chroot/tcpdump mode=0755
./var/chroot/tcpdump/etc mode=0755
./var/chroot/tftp-proxy mode=0755
./var/crash mode=0770
./var/cron

View File

@ -1,4 +1,4 @@
# $NetBSD: special,v 1.135 2011/02/02 02:20:28 rmind Exp $
# $NetBSD: special,v 1.136 2011/04/11 20:03:45 martin Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@ -395,6 +395,7 @@
./var/chroot/pflogd type=dir mode=0755
./var/chroot/sshd type=dir mode=0755
./var/chroot/tcpdump type=dir mode=0755
./var/chroot/tcpdump/etc type=dir mode=0755
./var/chroot/tftp-proxy type=dir mode=0755
./var/cron type=dir mode=0755
./var/cron/tabs type=dir mode=0700