[src/trunk]: src/sys/arch Sync DKWEDGE options with GENERIC

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48f6ac0361e0
branches:  trunk
changeset: 755881:48f6ac0361e0
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Jun 26 13:08:37 2010 +0000

description:
Sync DKWEDGE options with GENERIC

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0 |  9 ++++++++-
 sys/arch/i386/conf/XEN3_DOM0  |  9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r c4948709b5ac -r 48f6ac0361e0 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Jun 26 11:27:50 2010 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Jun 26 13:08:37 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.54 2010/05/22 19:02:07 plunky Exp $
+# $NetBSD: XEN3_DOM0,v 1.55 2010/06/26 13:08:37 bouyer Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -76,6 +76,13 @@
 options        EXEC_ELF32
 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)
diff -r c4948709b5ac -r 48f6ac0361e0 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Sat Jun 26 11:27:50 2010 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Sat Jun 26 13:08:37 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3_DOM0,v 1.34 2010/05/22 19:02:08 plunky Exp $
+#      $NetBSD: XEN3_DOM0,v 1.35 2010/06/26 13:08:37 bouyer Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -105,6 +105,13 @@
 #options       COMPAT_PECOFF   # kernel support to run Win32 apps
 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)