Module Name: src
Committed By: rin
Date: Sun Feb 26 12:41:50 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: GENERIC XEN3_DOM0 XEN3_DOMU
Log Message:
Comment out DISKLABEL_RDB as it is too specific for general usage.
(Also add commented out that entry for GENERIC on amd64; I forgot it)
To generate a diff of this commit:
cvs rdiff -u -r1.453 -r1.454 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.1151 -r1.1152 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/conf/XEN3_DOMU
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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.453 src/sys/arch/amd64/conf/GENERIC:1.454
--- src/sys/arch/amd64/conf/GENERIC:1.453 Sun Feb 26 12:21:14 2017
+++ src/sys/arch/amd64/conf/GENERIC Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.453 2017/02/26 12:21:14 maya Exp $
+# $NetBSD: GENERIC,v 1.454 2017/02/26 12:41:50 rin 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.453 $"
+#ident "GENERIC-$Revision: 1.454 $"
maxusers 64 # estimated number of users
@@ -143,6 +143,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.131 src/sys/arch/amd64/conf/XEN3_DOM0:1.132
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.131 Sun Feb 26 12:21:14 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.131 2017/02/26 12:21:14 maya Exp $
+# $NetBSD: XEN3_DOM0,v 1.132 2017/02/26 12:41:50 rin Exp $
include "arch/amd64/conf/std.xen"
@@ -86,7 +86,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
+#options DKWEDGE_METHOD_RDB # Support RDB 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.72 src/sys/arch/amd64/conf/XEN3_DOMU:1.73
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.72 Sun Feb 26 12:21:14 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.72 2017/02/26 12:21:14 maya Exp $
+# $NetBSD: XEN3_DOMU,v 1.73 2017/02/26 12:41:50 rin Exp $
include "arch/amd64/conf/std.xen"
@@ -78,7 +78,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
+#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
# File systems
file-system FFS # UFS
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1151 src/sys/arch/i386/conf/GENERIC:1.1152
--- src/sys/arch/i386/conf/GENERIC:1.1151 Sun Feb 26 12:21:15 2017
+++ src/sys/arch/i386/conf/GENERIC Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1151 2017/02/26 12:21:15 maya Exp $
+# $NetBSD: GENERIC,v 1.1152 2017/02/26 12:41:50 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.1151 $"
+#ident "GENERIC-$Revision: 1.1152 $"
maxusers 64 # estimated number of users
@@ -157,7 +157,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
+#options DKWEDGE_METHOD_RDB # Support RDB 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.109 src/sys/arch/i386/conf/XEN3_DOM0:1.110
--- src/sys/arch/i386/conf/XEN3_DOM0:1.109 Sun Feb 26 12:21:15 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.109 2017/02/26 12:21:15 maya Exp $
+# $NetBSD: XEN3_DOM0,v 1.110 2017/02/26 12:41:50 rin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -109,7 +109,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
+#options DKWEDGE_METHOD_RDB # Support RDB 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.75 src/sys/arch/i386/conf/XEN3_DOMU:1.76
--- src/sys/arch/i386/conf/XEN3_DOMU:1.75 Sun Feb 26 12:21:15 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU Sun Feb 26 12:41:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.75 2017/02/26 12:21:15 maya Exp $
+# $NetBSD: XEN3_DOMU,v 1.76 2017/02/26 12:41:50 rin Exp $
include "arch/xen/conf/std.xen"
@@ -93,7 +93,7 @@ options DKWEDGE_METHOD_GPT # Supports G
#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
+#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
# File systems
file-system FFS # UFS
