Module Name: src
Committed By: christos
Date: Mon Aug 18 06:31:24 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/evbarm/conf: BCM5301X BCM56340 CUBIEBOARD GOLDENGATE
MV2120 ODROID ODROID-U SHEEVAPLUG
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/sandpoint/conf: GENERIC
src/sys/arch/zaurus/conf: GENERIC
Log Message:
- Enable Wedge support for MBR/BSDLABEL where it was commented out.
- Add apple partition support where it was missing
- Add comments where missing
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.393 -r1.394 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/BCM5301X
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/BCM56340
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/GOLDENGATE
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ODROID
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/ODROID-U
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.381 -r1.382 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1108 -r1.1109 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.313 -r1.314 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/zaurus/conf/GENERIC
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/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.14 src/sys/arch/amd64/conf/ALL:1.15
--- src/sys/arch/amd64/conf/ALL:1.14 Sat Aug 16 13:56:31 2014
+++ src/sys/arch/amd64/conf/ALL Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.14 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: ALL,v 1.15 2014/08/18 06:31:24 christos 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.14 $"
+#ident "ALL-$Revision: 1.15 $"
maxusers 64 # estimated number of users
@@ -158,7 +158,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.393 src/sys/arch/amd64/conf/GENERIC:1.394
--- src/sys/arch/amd64/conf/GENERIC:1.393 Sat Aug 16 13:56:31 2014
+++ src/sys/arch/amd64/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.393 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: GENERIC,v 1.394 2014/08/18 06:31:24 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.393 $"
+#ident "GENERIC-$Revision: 1.394 $"
maxusers 64 # estimated number of users
@@ -130,10 +130,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
-# The following three 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
-#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
# File systems
file-system FFS # UFS
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.104 src/sys/arch/amd64/conf/XEN3_DOM0:1.105
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.104 Sat Aug 16 13:56:31 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.104 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: XEN3_DOM0,v 1.105 2014/08/18 06:31:24 christos Exp $
include "arch/amd64/conf/std.xen"
@@ -81,9 +81,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.55 src/sys/arch/amd64/conf/XEN3_DOMU:1.56
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.55 Sat Aug 16 13:56:31 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.55 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: XEN3_DOMU,v 1.56 2014/08/18 06:31:24 christos Exp $
include "arch/amd64/conf/std.xen"
@@ -75,9 +75,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/evbarm/conf/BCM5301X
diff -u src/sys/arch/evbarm/conf/BCM5301X:1.21 src/sys/arch/evbarm/conf/BCM5301X:1.22
--- src/sys/arch/evbarm/conf/BCM5301X:1.21 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/BCM5301X Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.21 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: BCM5301X,v 1.22 2014/08/18 06:31:24 christos Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -121,8 +121,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options MODULAR # support dynamically loaded kernel modules
Index: src/sys/arch/evbarm/conf/BCM56340
diff -u src/sys/arch/evbarm/conf/BCM56340:1.6 src/sys/arch/evbarm/conf/BCM56340:1.7
--- src/sys/arch/evbarm/conf/BCM56340:1.6 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/BCM56340 Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM56340,v 1.6 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: BCM56340,v 1.7 2014/08/18 06:31:24 christos Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -121,8 +121,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options MODULAR # support dynamically loaded kernel modules
Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.14 src/sys/arch/evbarm/conf/CUBIEBOARD:1.15
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.14 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: CUBIEBOARD,v 1.14 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: CUBIEBOARD,v 1.15 2014/08/18 06:31:24 christos Exp $
#
# CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
#
@@ -116,8 +116,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: src/sys/arch/evbarm/conf/GOLDENGATE
diff -u src/sys/arch/evbarm/conf/GOLDENGATE:1.9 src/sys/arch/evbarm/conf/GOLDENGATE:1.10
--- src/sys/arch/evbarm/conf/GOLDENGATE:1.9 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/GOLDENGATE Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: GOLDENGATE,v 1.9 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: GOLDENGATE,v 1.10 2014/08/18 06:31:24 christos Exp $
#
# GOLDENGATE -- Cortina GOLDENGATE Eval Board Kernel
#
@@ -118,8 +118,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.23 src/sys/arch/evbarm/conf/MV2120:1.24
--- src/sys/arch/evbarm/conf/MV2120:1.23 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/MV2120 Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.23 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: MV2120,v 1.24 2014/08/18 06:31:24 christos Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -345,7 +345,9 @@ options PAX_ASLR=0 # PaX Address Space
pseudo-device drvctl
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
+
options BUFQ_READPRIO
options BUFQ_PRIOCSCAN
Index: src/sys/arch/evbarm/conf/ODROID
diff -u src/sys/arch/evbarm/conf/ODROID:1.7 src/sys/arch/evbarm/conf/ODROID:1.8
--- src/sys/arch/evbarm/conf/ODROID:1.7 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/ODROID Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID,v 1.7 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: ODROID,v 1.8 2014/08/18 06:31:24 christos Exp $
#
# ODROID -- ODROID series Exynos Kernel
#
@@ -129,8 +129,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: src/sys/arch/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.11 src/sys/arch/evbarm/conf/ODROID-U:1.12
--- src/sys/arch/evbarm/conf/ODROID-U:1.11 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/ODROID-U Mon Aug 18 02:31:24 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID-U,v 1.11 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: ODROID-U,v 1.12 2014/08/18 06:31:24 christos Exp $
#
# ODROID-U -- ODROID-U series Exynos Kernel
#
@@ -122,8 +122,9 @@ options SYSVSHM # System V-like memory
#options MINIROOTSIZE=1000 # Size in blocks
#options MEMORY_DISK_IS_ROOT # use memory disk as root
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.41 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.42
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.41 Sun Aug 17 17:17:43 2014
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.41 2014/08/17 21:17:43 joerg Exp $
+# $NetBSD: SHEEVAPLUG,v 1.42 2014/08/18 06:31:24 christos Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -135,8 +135,9 @@ options SYSVSHM # System V-like memory
#options MEMORY_DISK_ROOT_SIZE=22528 # Size in blocks
#options MEMORY_RBFLAGS=RB_AUTOBOOT
-options DKWEDGE_AUTODISCOVER
-options DKWEDGE_METHOD_GPT
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
# Miscellaneous kernel options
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.381 src/sys/arch/i386/conf/ALL:1.382
--- src/sys/arch/i386/conf/ALL:1.381 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/i386/conf/ALL Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.381 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: ALL,v 1.382 2014/08/18 06:31:24 christos 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.381 $"
+#ident "ALL-$Revision: 1.382 $"
maxusers 64 # estimated number of users
@@ -158,7 +158,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1108 src/sys/arch/i386/conf/GENERIC:1.1109
--- src/sys/arch/i386/conf/GENERIC:1.1108 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/i386/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1108 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: GENERIC,v 1.1109 2014/08/18 06:31:24 christos 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.1108 $"
+#ident "GENERIC-$Revision: 1.1109 $"
maxusers 64 # estimated number of users
@@ -154,10 +154,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
-# The following three 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
-#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
file-system FFS # UFS
file-system NFS # Network File System client
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.86 src/sys/arch/i386/conf/XEN3_DOM0:1.87
--- src/sys/arch/i386/conf/XEN3_DOM0:1.86 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.86 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: XEN3_DOM0,v 1.87 2014/08/18 06:31:24 christos Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -104,9 +104,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.60 src/sys/arch/i386/conf/XEN3_DOMU:1.61
--- src/sys/arch/i386/conf/XEN3_DOMU:1.60 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.60 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: XEN3_DOMU,v 1.61 2014/08/18 06:31:24 christos Exp $
include "arch/xen/conf/std.xen"
@@ -90,9 +90,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.313 src/sys/arch/macppc/conf/GENERIC:1.314
--- src/sys/arch/macppc/conf/GENERIC:1.313 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/macppc/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.313 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: GENERIC,v 1.314 2014/08/18 06:31:24 christos 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.313 $"
+#ident "GENERIC-$Revision: 1.314 $"
maxusers 32
@@ -86,9 +86,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.2 src/sys/arch/macppc/conf/GENERIC_601:1.3
--- src/sys/arch/macppc/conf/GENERIC_601:1.2 Sat Aug 16 13:56:32 2014
+++ src/sys/arch/macppc/conf/GENERIC_601 Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.2 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: GENERIC_601,v 1.3 2014/08/18 06:31:24 christos Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.2 $"
+ident "GENERIC-$Revision: 1.3 $"
maxusers 32
@@ -78,9 +78,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.152 src/sys/arch/ofppc/conf/GENERIC:1.153
--- src/sys/arch/ofppc/conf/GENERIC:1.152 Sat Aug 16 13:56:33 2014
+++ src/sys/arch/ofppc/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.152 2014/08/16 17:56:33 apb Exp $
+# $NetBSD: GENERIC,v 1.153 2014/08/18 06:31:24 christos 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.152 $"
+#ident "GENERIC-$Revision: 1.153 $"
maxusers 32
@@ -83,9 +83,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.82 src/sys/arch/sandpoint/conf/GENERIC:1.83
--- src/sys/arch/sandpoint/conf/GENERIC:1.82 Sat Aug 16 13:56:33 2014
+++ src/sys/arch/sandpoint/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.82 2014/08/16 17:56:33 apb Exp $
+# $NetBSD: GENERIC,v 1.83 2014/08/18 06:31:24 christos Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.82 $"
+#ident "GENERIC-$Revision: 1.83 $"
maxusers 32
@@ -84,11 +84,11 @@ options COMPAT_43 # 4.3BSD, 386BSD, and
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
+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
# File systems
file-system FFS # UFS
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.59 src/sys/arch/zaurus/conf/GENERIC:1.60
--- src/sys/arch/zaurus/conf/GENERIC:1.59 Sun Aug 17 17:17:44 2014
+++ src/sys/arch/zaurus/conf/GENERIC Mon Aug 18 02:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.59 2014/08/17 21:17:44 joerg Exp $
+# $NetBSD: GENERIC,v 1.60 2014/08/18 06:31:24 christos Exp $
#
# GENERIC machine description file
#
@@ -108,10 +108,10 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# 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
+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
# Shared memory options
