Module Name: src
Committed By: msaitoh
Date: Sun Jun 9 11:44:04 UTC 2013
Modified Files:
src/sys/arch/amd64/conf [netbsd-5]: XEN3_DOMU
src/sys/arch/i386/conf [netbsd-5]: XEN2_DOMU
Log Message:
Apply patch (requested by sborrill in ticket #1858):
sys/arch/amd64/conf/XEN3_DOMU
sys/arch/i386/conf/Attic/XEN2_DOMU
Add wedge support in DOMU kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.13.4.3 -r1.13.4.4 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.19.4.3 -r1.19.4.4 src/sys/arch/i386/conf/XEN2_DOMU
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_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.3 src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.4
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.13.4.3 Sun Jan 13 16:46:22 2013
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Jun 9 11:44:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.13.4.3 2013/01/13 16:46:22 bouyer Exp $
+# $NetBSD: XEN3_DOMU,v 1.13.4.4 2013/06/09 11:44:04 msaitoh Exp $
include "arch/amd64/conf/std.xen"
@@ -68,6 +68,13 @@ options COMPAT_LINUX32 # req. COMPAT_LI
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_DOMU
diff -u src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.3 src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.4
--- src/sys/arch/i386/conf/XEN2_DOMU:1.19.4.3 Sun Jan 13 16:46:22 2013
+++ src/sys/arch/i386/conf/XEN2_DOMU Sun Jun 9 11:44:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: XEN2_DOMU,v 1.19.4.3 2013/01/13 16:46:22 bouyer Exp $
+# $NetBSD: XEN2_DOMU,v 1.19.4.4 2013/06/09 11:44:04 msaitoh Exp $
include "arch/xen/conf/std.xen"
@@ -86,6 +86,13 @@ options COMPAT_FREEBSD # binary compati
#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)
