Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Disable BSDLABEL and MBR DKWEDGE methods again sinc...



details:   https://anonhg.NetBSD.org/src/rev/bb352cef0e06
branches:  trunk
changeset: 332381:bb352cef0e06
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 19 15:24:24 2014 +0000

description:
Disable BSDLABEL and MBR DKWEDGE methods again since sysinst does not work
with wedges.

diffstat:

 sys/arch/amd64/conf/ALL          |  8 ++++----
 sys/arch/amd64/conf/GENERIC      |  8 ++++----
 sys/arch/amd64/conf/XEN3_DOM0    |  6 +++---
 sys/arch/amd64/conf/XEN3_DOMU    |  6 +++---
 sys/arch/i386/conf/ALL           |  8 ++++----
 sys/arch/i386/conf/GENERIC       |  8 ++++----
 sys/arch/i386/conf/XEN3_DOM0     |  6 +++---
 sys/arch/i386/conf/XEN3_DOMU     |  6 +++---
 sys/arch/macppc/conf/GENERIC     |  8 ++++----
 sys/arch/macppc/conf/GENERIC_601 |  8 ++++----
 sys/arch/ofppc/conf/GENERIC      |  8 ++++----
 sys/arch/sandpoint/conf/GENERIC  |  8 ++++----
 sys/arch/zaurus/conf/GENERIC     |  6 +++---
 13 files changed, 47 insertions(+), 47 deletions(-)

diffs (truncated from 332 to 300 lines):

diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/amd64/conf/ALL   Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.18 2014/08/24 07:59:22 jnemeth Exp $
+# $NetBSD: ALL,v 1.19 2014/09/19 15:24: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.18 $"
+#ident                 "ALL-$Revision: 1.19 $"
 
 maxusers       64              # estimated number of users
 
@@ -160,8 +160,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.397 2014/09/18 14:58:22 wiz Exp $
+# $NetBSD: GENERIC,v 1.398 2014/09/19 15:24: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.397 $"
+#ident                 "GENERIC-$Revision: 1.398 $"
 
 maxusers       64              # estimated number of users
 
@@ -132,8 +132,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.106 2014/08/23 20:26:56 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.107 2014/09/19 15:24:24 christos Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -81,8 +81,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU     Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU     Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.57 2014/08/23 20:26:56 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.58 2014/09/19 15:24:24 christos Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -75,8 +75,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.384 2014/08/23 21:05:39 dholland Exp $
+# $NetBSD: ALL,v 1.385 2014/09/19 15:24: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.384 $"
+#ident                 "ALL-$Revision: 1.385 $"
 
 maxusers       64              # estimated number of users
 
@@ -159,8 +159,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1112 2014/09/18 14:58:21 wiz Exp $
+# $NetBSD: GENERIC,v 1.1113 2014/09/19 15:24: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.1112 $"
+#ident                 "GENERIC-$Revision: 1.1113 $"
 
 maxusers       64              # estimated number of users
 
@@ -156,8 +156,8 @@
 # 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
 
 file-system    FFS             # UFS
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/i386/conf/XEN3_DOM0
--- a/sys/arch/i386/conf/XEN3_DOM0      Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/i386/conf/XEN3_DOM0      Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: XEN3_DOM0,v 1.88 2014/08/23 20:26:58 dholland Exp $
+#      $NetBSD: XEN3_DOM0,v 1.89 2014/09/19 15:24:24 christos Exp $
 #
 #      XEN3_0: Xen 3.0 domain0 kernel
 
@@ -104,8 +104,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/i386/conf/XEN3_DOMU
--- a/sys/arch/i386/conf/XEN3_DOMU      Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/i386/conf/XEN3_DOMU      Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.62 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.63 2014/09/19 15:24:24 christos Exp $
 
 include        "arch/xen/conf/std.xen"
 
@@ -90,8 +90,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC      Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/macppc/conf/GENERIC      Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.316 2014/08/24 07:59:23 jnemeth Exp $
+# $NetBSD: GENERIC,v 1.317 2014/09/19 15:24: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.316 $"
+#ident                 "GENERIC-$Revision: 1.317 $"
 
 maxusers       32
 
@@ -87,8 +87,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/macppc/conf/GENERIC_601
--- a/sys/arch/macppc/conf/GENERIC_601  Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/macppc/conf/GENERIC_601  Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.5 2014/08/24 07:59:23 jnemeth Exp $
+# $NetBSD: GENERIC_601,v 1.6 2014/09/19 15:24:24 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -28,7 +28,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.5 $"
+ident          "GENERIC-$Revision: 1.6 $"
 
 maxusers       32
 
@@ -79,8 +79,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/ofppc/conf/GENERIC
--- a/sys/arch/ofppc/conf/GENERIC       Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/ofppc/conf/GENERIC       Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.154 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC,v 1.155 2014/09/19 15:24: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.154 $"
+#ident                 "GENERIC-$Revision: 1.155 $"
 
 maxusers       32
 
@@ -83,8 +83,8 @@
 # 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
 
 # File systems
diff -r e03f432fbac1 -r bb352cef0e06 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Fri Sep 19 14:48:42 2014 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Fri Sep 19 15:24:24 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.85 2014/08/24 07:59:23 jnemeth Exp $
+# $NetBSD: GENERIC,v 1.86 2014/09/19 15:24:24 christos Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.85 $"
+#ident                 "GENERIC-$Revision: 1.86 $"
 
 maxusers       32



Home | Main Index | Thread Index | Old Index