Module Name: src
Committed By: bouyer
Date: Sat Jun 26 13:08:37 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/i386/conf: XEN3_DOM0
Log Message:
Sync DKWEDGE options with GENERIC
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3_DOM0
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.54 src/sys/arch/amd64/conf/XEN3_DOM0:1.55
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.54 Sat May 22 19:02:07 2010
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jun 26 13:08:37 2010
@@ -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)
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.34 src/sys/arch/i386/conf/XEN3_DOM0:1.35
--- src/sys/arch/i386/conf/XEN3_DOM0:1.34 Sat May 22 19:02:08 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Jun 26 13:08:37 2010
@@ -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)
