add apple autodiscovery.

This commit is contained in:
christos 2012-04-07 05:39:55 +00:00
parent 23fc2b12e7
commit 40b3227a8d
1 changed files with 6 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.351 2012/03/25 00:11:16 nonaka Exp $
# $NetBSD: GENERIC,v 1.352 2012/04/07 05:39:55 christos Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.351 $"
#ident "GENERIC-$Revision: 1.352 $"
maxusers 64 # estimated number of users
@ -127,9 +127,11 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
# The following three options can break /etc/fstab, so handle with care
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
#options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
file-system FFS # UFS
file-system MFS # memory file system
@ -1197,7 +1199,7 @@ pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#