From owner-p4-projects@FreeBSD.ORG Sun Jul 27 07:06:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF8D037B404; Sun, 27 Jul 2003 07:06:30 -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 70DD937B401 for ; Sun, 27 Jul 2003 07:06:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DD4D43F93 for ; Sun, 27 Jul 2003 07:06:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6RE6T0U094834 for ; Sun, 27 Jul 2003 07:06:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6RE6TrZ094829 for perforce@freebsd.org; Sun, 27 Jul 2003 07:06:29 -0700 (PDT) Date: Sun, 27 Jul 2003 07:06:29 -0700 (PDT) Message-Id: <200307271406.h6RE6TrZ094829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 35086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2003 14:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=35086 Change 35086 by rwatson@rwatson_tislabs on 2003/07/27 07:06:15 Manually integrate MACALL kernel configuration from MAC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.384 2003/05/18 20:39:15 ru Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.386 2003/06/08 02:03:01 jmallett Exp $ machine i386 cpu I486_CPU @@ -56,7 +56,7 @@ options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as root device, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) @@ -132,7 +132,7 @@ device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals -device scbus # SCSI bus (required) +device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc)