Module Name: src
Committed By: riz
Date: Sat Mar 17 19:57:14 UTC 2012
Modified Files:
src/sys/arch/macppc/conf: GENERIC
Log Message:
Add autodiscover wedge support to macppc GENERIC, to allow use of
GPT-partitioned disks in a similar way to amd64/i386.
To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/sys/arch/macppc/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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.299 src/sys/arch/macppc/conf/GENERIC:1.300
--- src/sys/arch/macppc/conf/GENERIC:1.299 Sat Mar 17 19:54:09 2012
+++ src/sys/arch/macppc/conf/GENERIC Sat Mar 17 19:57:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.299 2012/03/17 19:54:09 riz Exp $
+# $NetBSD: GENERIC,v 1.300 2012/03/17 19:57:14 riz Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.299 $"
+#ident "GENERIC-$Revision: 1.300 $"
maxusers 32
@@ -81,6 +81,13 @@ options COMPAT_43 # and 4.3BSD
#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)
