Module Name: src
Committed By: mrg
Date: Sun Jan 2 11:25:32 UTC 2011
Modified Files:
src/sys/arch/ofppc/conf: GENERIC
Log Message:
add the normal DKWEDGE* options, and enable drvctl.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/ofppc/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.134 src/sys/arch/ofppc/conf/GENERIC:1.135
--- src/sys/arch/ofppc/conf/GENERIC:1.134 Fri Dec 31 21:50:27 2010
+++ src/sys/arch/ofppc/conf/GENERIC Sun Jan 2 11:25:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.134 2010/12/31 21:50:27 phx Exp $
+# $NetBSD: GENERIC,v 1.135 2011/01/02 11:25:31 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.134 $"
+#ident "GENERIC-$Revision: 1.135 $"
maxusers 32
@@ -80,6 +80,13 @@
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
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
+#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
+#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
+
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
@@ -445,6 +452,9 @@
#pseudo-device pflog # PF log if
pseudo-device putter # for puffs and pud
+# userland interface to drivers, including autoconf and properties retrieval
+pseudo-device drvctl
+
# Veriexec
#
# a pseudo device needed for veriexec
