[src/trunk]: src/sys/arch - Enable Wedge support for MBR/BSDLABEL where it wa...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch - Enable Wedge support for MBR/BSDLABEL where it wa...
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 03:36:42 +0000
details:   https://anonhg.NetBSD.org/src/rev/2d1c5c7dc92f
branches:  trunk
changeset: 801792:2d1c5c7dc92f
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 18 06:31:24 2014 +0000

description:
- Enable Wedge support for MBR/BSDLABEL where it was commented out.
- Add apple partition support where it was missing
- Add comments where missing

diffstat:

 sys/arch/amd64/conf/ALL          |   5 ++---
 sys/arch/amd64/conf/GENERIC      |  11 +++++------
 sys/arch/amd64/conf/XEN3_DOM0    |   8 ++++----
 sys/arch/amd64/conf/XEN3_DOMU    |   8 ++++----
 sys/arch/evbarm/conf/BCM5301X    |   7 ++++---
 sys/arch/evbarm/conf/BCM56340    |   7 ++++---
 sys/arch/evbarm/conf/CUBIEBOARD  |   7 ++++---
 sys/arch/evbarm/conf/GOLDENGATE  |   7 ++++---
 sys/arch/evbarm/conf/MV2120      |   8 +++++---
 sys/arch/evbarm/conf/ODROID      |   7 ++++---
 sys/arch/evbarm/conf/ODROID-U    |   7 ++++---
 sys/arch/evbarm/conf/SHEEVAPLUG  |   7 ++++---
 sys/arch/i386/conf/ALL           |   5 ++---
 sys/arch/i386/conf/GENERIC       |  11 +++++------
 sys/arch/i386/conf/XEN3_DOM0     |   8 ++++----
 sys/arch/i386/conf/XEN3_DOMU     |   8 ++++----
 sys/arch/macppc/conf/GENERIC     |  10 +++++-----
 sys/arch/macppc/conf/GENERIC_601 |  10 +++++-----
 sys/arch/ofppc/conf/GENERIC      |  10 +++++-----
 sys/arch/sandpoint/conf/GENERIC  |  14 +++++++-------
 sys/arch/zaurus/conf/GENERIC     |  10 +++++-----
 21 files changed, 90 insertions(+), 85 deletions(-)

diffs (truncated from 530 to 300 lines):

diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/amd64/conf/ALL   Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 
 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 @@
 # 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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 # 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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 # 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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/BCM5301X
--- a/sys/arch/evbarm/conf/BCM5301X     Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/BCM5301X     Mon Aug 18 06:31:24 2014 +0000
@@ -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       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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/BCM56340
--- a/sys/arch/evbarm/conf/BCM56340     Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/BCM56340     Mon Aug 18 06:31:24 2014 +0000
@@ -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       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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/CUBIEBOARD
--- a/sys/arch/evbarm/conf/CUBIEBOARD   Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/CUBIEBOARD   Mon Aug 18 06:31:24 2014 +0000
@@ -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       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)
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/GOLDENGATE
--- a/sys/arch/evbarm/conf/GOLDENGATE   Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/GOLDENGATE   Mon Aug 18 06:31:24 2014 +0000
@@ -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       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)
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/MV2120
--- a/sys/arch/evbarm/conf/MV2120       Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/MV2120       Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 
 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
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/ODROID
--- a/sys/arch/evbarm/conf/ODROID       Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/ODROID       Mon Aug 18 06:31:24 2014 +0000
@@ -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       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)
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/ODROID-U
--- a/sys/arch/evbarm/conf/ODROID-U     Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/ODROID-U     Mon Aug 18 06:31:24 2014 +0000
@@ -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       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)
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/evbarm/conf/SHEEVAPLUG
--- a/sys/arch/evbarm/conf/SHEEVAPLUG   Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/evbarm/conf/SHEEVAPLUG   Mon Aug 18 06:31:24 2014 +0000
@@ -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       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
 
diff -r 6cf04a3ec332 -r 2d1c5c7dc92f sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Mon Aug 18 05:21:16 2014 +0000
+++ b/sys/arch/i386/conf/ALL    Mon Aug 18 06:31:24 2014 +0000
@@ -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 @@
 
 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 @@
 # 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
Prev by Date: [src/trunk]: src/usr.sbin/syslogd - when checking hostname of incoming remote...
Next by Date: [src/trunk]: src/tools/gmake switch to the new gmake
Previous by Thread: [src/trunk]: src/usr.sbin/syslogd - when checking hostname of incoming remote...
Next by Thread: [src/trunk]: src/tools/gmake switch to the new gmake
Indexes:
Home | Main Index | Thread Index | Old Index