Module Name: src
Committed By: riz
Date: Sun Nov 21 17:43:03 UTC 2010
Modified Files:
src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-5]: XEN2_DOM0
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1419):
sys/arch/i386/conf/XEN2_DOM0: patch
sys/arch/amd64/conf/XEN3_DOM0: revision 1.55
Sync DKWEDGE options with GENERIC
To generate a diff of this commit:
cvs rdiff -u -r1.33.4.5 -r1.33.4.6 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.53.2.5 -r1.53.2.6 src/sys/arch/i386/conf/XEN2_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.33.4.5 src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.6
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.33.4.5 Sun Nov 21 03:05:09 2010
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Nov 21 17:43:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.33.4.5 2010/11/21 03:05:09 riz Exp $
+# $NetBSD: XEN3_DOM0,v 1.33.4.6 2010/11/21 17:43:03 riz Exp $
include "arch/amd64/conf/std.xen"
@@ -69,6 +69,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/XEN2_DOM0
diff -u src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.5 src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.6
--- src/sys/arch/i386/conf/XEN2_DOM0:1.53.2.5 Sun Nov 21 03:05:05 2010
+++ src/sys/arch/i386/conf/XEN2_DOM0 Sun Nov 21 17:43:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOM0,v 1.53.2.5 2010/11/21 03:05:05 riz Exp $
+# $NetBSD: XEN2_DOM0,v 1.53.2.6 2010/11/21 17:43:03 riz Exp $
include "arch/xen/conf/std.xen"
@@ -89,6 +89,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)
