Apparently the i386 GENERIC kernel config already have some Veriexec

options and pseudo-device scattered in the file; remove duplicates.

Pointed out by xtraeme@, thanks. :)
This commit is contained in:
elad 2005-12-10 11:32:14 +00:00
parent f32d48a2f6
commit 6be8f742e5

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.711 2005/12/09 23:34:02 elad Exp $
# $NetBSD: GENERIC,v 1.712 2005/12/10 11:32:14 elad Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.711 $"
#ident "GENERIC-$Revision: 1.712 $"
maxusers 32 # estimated number of users
@ -212,20 +212,6 @@ options IPFILTER_LOG # ipmon(8) log support
#options ALTQ_RIO # RED with IN/OUT
#options ALTQ_WFQ # Weighted Fair Queueing
# These options control the verified exec feature
#options VERIFIED_EXEC
#
# Uncomment the fingerprint methods below that are desired. Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
#options ACPIVERBOSE # verbose ACPI device autoconfig messages
@ -1300,9 +1286,6 @@ pseudo-device vcoda 4 # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# a pseudo device needed for veriexec
#pseudo-device veriexec 1
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont