Module Name: src
Committed By: christos
Date: Fri Sep 19 15:24:24 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU
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:
Disable BSDLABEL and MBR DKWEDGE methods again since sysinst does not work
with wedges.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.397 -r1.398 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.384 -r1.385 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1112 -r1.1113 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.316 -r1.317 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.62 -r1.63 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.18 src/sys/arch/amd64/conf/ALL:1.19
--- src/sys/arch/amd64/conf/ALL:1.18 Sun Aug 24 03:59:22 2014
+++ src/sys/arch/amd64/conf/ALL Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ 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
-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
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.397 src/sys/arch/amd64/conf/GENERIC:1.398
--- src/sys/arch/amd64/conf/GENERIC:1.397 Thu Sep 18 10:58:22 2014
+++ src/sys/arch/amd64/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ 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
-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
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.106 src/sys/arch/amd64/conf/XEN3_DOM0:1.107
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.106 Sat Aug 23 16:26:56 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Sep 19 11:24:24 2014
@@ -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 @@ 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
-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
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.57 src/sys/arch/amd64/conf/XEN3_DOMU:1.58
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.57 Sat Aug 23 16:26:56 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Sep 19 11:24:24 2014
@@ -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 @@ 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
-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
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.384 src/sys/arch/i386/conf/ALL:1.385
--- src/sys/arch/i386/conf/ALL:1.384 Sat Aug 23 17:05:39 2014
+++ src/sys/arch/i386/conf/ALL Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ 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
-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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1112 src/sys/arch/i386/conf/GENERIC:1.1113
--- src/sys/arch/i386/conf/GENERIC:1.1112 Thu Sep 18 10:58:21 2014
+++ src/sys/arch/i386/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ 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
-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
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.88 src/sys/arch/i386/conf/XEN3_DOM0:1.89
--- src/sys/arch/i386/conf/XEN3_DOM0:1.88 Sat Aug 23 16:26:58 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Sep 19 11:24:24 2014
@@ -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 @@ 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
-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
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.62 src/sys/arch/i386/conf/XEN3_DOMU:1.63
--- src/sys/arch/i386/conf/XEN3_DOMU:1.62 Sat Aug 23 16:26:58 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Fri Sep 19 11:24:24 2014
@@ -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 @@ 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
-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
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.316 src/sys/arch/macppc/conf/GENERIC:1.317
--- src/sys/arch/macppc/conf/GENERIC:1.316 Sun Aug 24 03:59:23 2014
+++ src/sys/arch/macppc/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/macppc/conf/std.macppc"
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 @@ 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
-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
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.5 src/sys/arch/macppc/conf/GENERIC_601:1.6
--- src/sys/arch/macppc/conf/GENERIC_601:1.5 Sun Aug 24 03:59:23 2014
+++ src/sys/arch/macppc/conf/GENERIC_601 Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/macppc/conf/std.macppc.60
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 @@ 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
-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
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.154 src/sys/arch/ofppc/conf/GENERIC:1.155
--- src/sys/arch/ofppc/conf/GENERIC:1.154 Sat Aug 23 16:26:59 2014
+++ src/sys/arch/ofppc/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/ofppc/conf/std.ofppc"
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 @@ 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
-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
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.85 src/sys/arch/sandpoint/conf/GENERIC:1.86
--- src/sys/arch/sandpoint/conf/GENERIC:1.85 Sun Aug 24 03:59:23 2014
+++ src/sys/arch/sandpoint/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -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 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.85 $"
+#ident "GENERIC-$Revision: 1.86 $"
maxusers 32
@@ -87,8 +87,8 @@ 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
-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
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.62 src/sys/arch/zaurus/conf/GENERIC:1.63
--- src/sys/arch/zaurus/conf/GENERIC:1.62 Sun Aug 24 03:59:23 2014
+++ src/sys/arch/zaurus/conf/GENERIC Fri Sep 19 11:24:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.62 2014/08/24 07:59:23 jnemeth Exp $
+# $NetBSD: GENERIC,v 1.63 2014/09/19 15:24:24 christos Exp $
#
# GENERIC machine description file
#
@@ -109,8 +109,8 @@ 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
-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
# Shared memory options
