From owner-p4-projects@FreeBSD.ORG  Mon Apr 28 19:18:11 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0208E37B404; Mon, 28 Apr 2003 19:18:11 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A8E2C37B401
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 19:18:10 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5452A43F3F
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 19:18:10 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3T2IA0U021226
	for <perforce@freebsd.org>; Mon, 28 Apr 2003 19:18:10 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T2I958021220
	for perforce@freebsd.org; Mon, 28 Apr 2003 19:18:09 -0700 (PDT)
Date: Mon, 28 Apr 2003 19:18:09 -0700 (PDT)
Message-Id: <200304290218.h3T2I958021220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30024 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Apr 2003 02:18:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=30024

Change 30024 by peter@peter_daintree on 2003/04/28 19:17:41

	add NFSSERVER, bpf (for tcpdump), pty (for telnetd/sshd)

Affected files ...

.. //depot/projects/hammer/sys/x86_64/conf/GENERIC#14 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#14 (text+ko) ====

@@ -34,6 +34,7 @@
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	MD_ROOT			#MD is a potential root device
 options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSSERVER
 options 	NFS_ROOT		#NFS usable as root device, requires NFSCLIENT
 
 # Debugging for use in -current
@@ -48,6 +49,8 @@
 device		atadisk			# ATA disk drives
 device		atapicd			# ATAPI CDROM drives
 
+options	KTRACE
+
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 #device		atkbdc		# AT keyboard controller
 #device		atkbd		# AT keyboard
@@ -82,6 +85,8 @@
 device		loop		# Network loopback
 device		ether		# Ethernet support
 device		md		# Memory "disks"
+device		pty
+device		bpf
 
 # USB support
 #device          uhci            # UHCI PCI->USB interface