From 59e6f8272ecd36439b0912b02f21c599b1071842 Mon Sep 17 00:00:00 2001 From: rin Date: Sun, 26 Feb 2017 12:03:14 +0000 Subject: [PATCH] Add DKWEDGE_METHOD_RDB option, which is enabled for x86, commented out for other platforms by default. --- sys/arch/amd64/conf/ALL | 5 +++-- sys/arch/amd64/conf/XEN3_DOM0 | 3 ++- sys/arch/amd64/conf/XEN3_DOMU | 3 ++- sys/arch/evbarm/conf/ARMADILLO-IOT-G3 | 3 ++- sys/arch/i386/conf/ALL | 5 +++-- sys/arch/i386/conf/GENERIC | 5 +++-- sys/arch/i386/conf/XEN3_DOM0 | 3 ++- sys/arch/i386/conf/XEN3_DOMU | 3 ++- sys/arch/macppc/conf/GENERIC | 11 ++++++----- sys/arch/macppc/conf/GENERIC_601 | 9 +++++---- sys/arch/ofppc/conf/GENERIC | 5 +++-- sys/arch/riscv/conf/GENERIC | 5 +++-- sys/arch/sandpoint/conf/GENERIC | 5 +++-- sys/arch/zaurus/conf/GENERIC | 3 ++- 14 files changed, 41 insertions(+), 27 deletions(-) diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL index 6a30d08b8251..0da90fb41a2b 100644 --- a/sys/arch/amd64/conf/ALL +++ b/sys/arch/amd64/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.52 2017/02/19 07:46:59 rin Exp $ +# $NetBSD: ALL,v 1.53 2017/02/26 12:03:14 rin Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.52 $" +#ident "ALL-$Revision: 1.53 $" maxusers 64 # estimated number of users @@ -163,6 +163,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0 index 13ada24f4142..1ecb433f7334 100644 --- a/sys/arch/amd64/conf/XEN3_DOM0 +++ b/sys/arch/amd64/conf/XEN3_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.129 2017/02/19 07:46:59 rin Exp $ +# $NetBSD: XEN3_DOM0,v 1.130 2017/02/26 12:03:14 rin Exp $ include "arch/amd64/conf/std.xen" @@ -86,6 +86,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU index fc9e89e9adf6..d55fe05d225c 100644 --- a/sys/arch/amd64/conf/XEN3_DOMU +++ b/sys/arch/amd64/conf/XEN3_DOMU @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.70 2017/02/19 07:46:59 rin Exp $ +# $NetBSD: XEN3_DOMU,v 1.71 2017/02/26 12:03:14 rin Exp $ include "arch/amd64/conf/std.xen" @@ -78,6 +78,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 index 57cdc94112b9..3f3c6a1bffe6 100644 --- a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 +++ b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO-IOT-G3,v 1.5 2017/02/19 07:47:00 rin Exp $ +# $NetBSD: ARMADILLO-IOT-G3,v 1.6 2017/02/26 12:03:14 rin Exp $ # # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3 # @@ -103,6 +103,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index 3f2a00d77608..9923b7730cc6 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.413 2017/02/19 07:47:00 rin Exp $ +# $NetBSD: ALL,v 1.414 2017/02/26 12:03:14 rin Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.413 $" +#ident "ALL-$Revision: 1.414 $" maxusers 64 # estimated number of users @@ -162,6 +162,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 4d29eca8cbb7..bda7ef4cc108 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1149 2017/02/19 07:47:00 rin Exp $ +# $NetBSD: GENERIC,v 1.1150 2017/02/26 12:03:14 rin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1149 $" +#ident "GENERIC-$Revision: 1.1150 $" maxusers 64 # estimated number of users @@ -157,6 +157,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges file-system FFS # UFS file-system NFS # Network File System client diff --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0 index e6b5e56c7378..665262b00289 100644 --- a/sys/arch/i386/conf/XEN3_DOM0 +++ b/sys/arch/i386/conf/XEN3_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.107 2017/02/19 07:47:01 rin Exp $ +# $NetBSD: XEN3_DOM0,v 1.108 2017/02/26 12:03:14 rin Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -109,6 +109,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/i386/conf/XEN3_DOMU b/sys/arch/i386/conf/XEN3_DOMU index a73df9d241d4..3e8e02b8af1e 100644 --- a/sys/arch/i386/conf/XEN3_DOMU +++ b/sys/arch/i386/conf/XEN3_DOMU @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.73 2017/02/19 07:47:01 rin Exp $ +# $NetBSD: XEN3_DOMU,v 1.74 2017/02/26 12:03:14 rin Exp $ include "arch/xen/conf/std.xen" @@ -93,6 +93,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index aa4622f69907..6af52645e65f 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.327 2017/01/02 03:22:30 sevan Exp $ +# $NetBSD: GENERIC,v 1.328 2017/02/26 12:03:14 rin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.327 $" +#ident "GENERIC-$Revision: 1.328 $" maxusers 32 @@ -87,9 +87,10 @@ 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 -#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges -#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges -#options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +#options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/macppc/conf/GENERIC_601 b/sys/arch/macppc/conf/GENERIC_601 index 6eb6bce7991d..f32098120574 100644 --- a/sys/arch/macppc/conf/GENERIC_601 +++ b/sys/arch/macppc/conf/GENERIC_601 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_601,v 1.11 2016/12/13 20:42:19 christos Exp $ +# $NetBSD: GENERIC_601,v 1.12 2017/02/26 12:03:14 rin Exp $ # # GENERIC machine description file # @@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.601" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.11 $" +ident "GENERIC-$Revision: 1.12 $" maxusers 32 @@ -79,9 +79,10 @@ 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 -#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges -#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC index f0902f535f50..f06278e12d64 100644 --- a/sys/arch/ofppc/conf/GENERIC +++ b/sys/arch/ofppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:19 christos Exp $ +# $NetBSD: GENERIC,v 1.162 2017/02/26 12:03:14 rin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.161 $" +#ident "GENERIC-$Revision: 1.162 $" maxusers 32 @@ -85,6 +85,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/riscv/conf/GENERIC b/sys/arch/riscv/conf/GENERIC index 0b6d3394c74d..4af79b3d71d6 100644 --- a/sys/arch/riscv/conf/GENERIC +++ b/sys/arch/riscv/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.4 2017/02/19 07:47:01 rin Exp $ +# $NetBSD: GENERIC,v 1.5 2017/02/26 12:03:14 rin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/riscv/conf/std.riscv64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.4 $" +#ident "GENERIC-$Revision: 1.5 $" maxusers 64 # estimated number of users @@ -87,6 +87,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges include "conf/filesystems.config" diff --git a/sys/arch/sandpoint/conf/GENERIC b/sys/arch/sandpoint/conf/GENERIC index 913bc026ea1f..9f88a392b872 100644 --- a/sys/arch/sandpoint/conf/GENERIC +++ b/sys/arch/sandpoint/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.92 2017/02/19 07:47:01 rin Exp $ +# $NetBSD: GENERIC,v 1.93 2017/02/26 12:03:14 rin Exp $ # # machine description file for GENERIC NAS # @@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpoint" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.92 $" +#ident "GENERIC-$Revision: 1.93 $" maxusers 32 @@ -90,6 +90,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # File systems file-system FFS # UFS diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index f0210d482348..eac6155c7974 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.71 2017/02/19 07:47:01 rin Exp $ +# $NetBSD: GENERIC,v 1.72 2017/02/26 12:03:15 rin Exp $ # # GENERIC machine description file # @@ -115,6 +115,7 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges +#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges # Shared memory options