Wed Apr 17 00:09:04 2013 UTC ()
Sync DKWEDGE options with XEN3_DOM0.


(riz)
diff -r1.45 -r1.46 src/sys/arch/amd64/conf/XEN3_DOMU
cvs diff -r1.45 -r1.46 src/sys/arch/amd64/conf/XEN3_DOMU (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/XEN3_DOMU 2013/03/02 02:42:08 1.45
+++ src/sys/arch/amd64/conf/XEN3_DOMU 2013/04/17 00:09:04 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOMU,v 1.45 2013/03/02 02:42:08 christos Exp $ 1# $NetBSD: XEN3_DOMU,v 1.46 2013/04/17 00:09:04 riz Exp $
2 2
3include "arch/amd64/conf/std.xen" 3include "arch/amd64/conf/std.xen"
4 4
5options MULTIPROCESSOR 5options MULTIPROCESSOR
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8 8
9#options UVMHIST 9#options UVMHIST
10#options UVMHIST_PRINT 10#options UVMHIST_PRINT
11#options SYSCALL_DEBUG 11#options SYSCALL_DEBUG
12 12
13maxusers 32 # estimated number of users 13maxusers 32 # estimated number of users
14 14
@@ -61,26 +61,33 @@ options COMPAT_30 # NetBSD 3.0, @@ -61,26 +61,33 @@ options COMPAT_30 # NetBSD 3.0,
61options COMPAT_40 # NetBSD 4.0 compatibility. 61options COMPAT_40 # NetBSD 4.0 compatibility.
62options COMPAT_43 # and 4.3BSD 62options COMPAT_43 # and 4.3BSD
63#options COMPAT_386BSD_MBRPART # recognize old partition ID 63#options COMPAT_386BSD_MBRPART # recognize old partition ID
64options COMPAT_50 # NetBSD 5.0, 64options COMPAT_50 # NetBSD 5.0,
65options COMPAT_60 # NetBSD 6.0 compatibility. 65options COMPAT_60 # NetBSD 6.0 compatibility.
66 66
67options COMPAT_OSSAUDIO 67options COMPAT_OSSAUDIO
68options COMPAT_NETBSD32 68options COMPAT_NETBSD32
69options COMPAT_LINUX 69options COMPAT_LINUX
70options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32 70options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
71options EXEC_ELF32 71options EXEC_ELF32
72options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 72options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
73 73
 74# Wedge support
 75options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
 76options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
 77# The following two options can break /etc/fstab, so handle with care
 78#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
 79#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
 80
74# File systems 81# File systems
75file-system FFS # UFS 82file-system FFS # UFS
76file-system EXT2FS # second extended file system (linux) 83file-system EXT2FS # second extended file system (linux)
77file-system LFS # log-structured file system 84file-system LFS # log-structured file system
78file-system MFS # memory file system 85file-system MFS # memory file system
79file-system NFS # Network File System client 86file-system NFS # Network File System client
80file-system NTFS # Windows/NT file system (experimental) 87file-system NTFS # Windows/NT file system (experimental)
81file-system CD9660 # ISO 9660 + Rock Ridge file system 88file-system CD9660 # ISO 9660 + Rock Ridge file system
82file-system MSDOSFS # MS-DOS file system 89file-system MSDOSFS # MS-DOS file system
83file-system FDESC # /dev/fd 90file-system FDESC # /dev/fd
84file-system KERNFS # /kern 91file-system KERNFS # /kern
85file-system NULLFS # loopback file system 92file-system NULLFS # loopback file system
86file-system OVERLAY # overlay file system 93file-system OVERLAY # overlay file system