Module Name: src
Committed By: rin
Date: Mon Nov 6 02:57:19 UTC 2017
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: GENERIC GENERIC_PS2TINY GENERIC_TINY
INSTALL_FLOPPY INSTALL_TINY NET4501 XEN3_DOM0 XEN3_DOMU
src/sys/arch/riscv/conf: GENERIC
Log Message:
Revive commented out DISKLABEL_EI option to kernel configuration files
that contain FFS_EI option.
To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.1169 -r1.1170 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/i386/conf/NET4501
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.467 src/sys/arch/amd64/conf/GENERIC:1.468
--- src/sys/arch/amd64/conf/GENERIC:1.467 Thu Oct 19 23:59:56 2017
+++ src/sys/arch/amd64/conf/GENERIC Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.467 2017/10/19 23:59:56 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.468 2017/11/06 02:57:18 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.467 $"
+#ident "GENERIC-$Revision: 1.468 $"
maxusers 64 # estimated number of users
@@ -164,6 +164,7 @@ file-system PTYFS # /dev/ptm support
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.140 src/sys/arch/amd64/conf/XEN3_DOM0:1.141
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.140 Sat Sep 30 09:03:38 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.140 2017/09/30 09:03:38 pgoyette Exp $
+# $NetBSD: XEN3_DOM0,v 1.141 2017/11/06 02:57:18 rin Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.140 $"
+#ident "XEN3_DOM0-$Revision: 1.141 $"
maxusers 32 # estimated number of users
@@ -106,6 +106,7 @@ file-system TMPFS # Efficient memory fi
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.79 src/sys/arch/amd64/conf/XEN3_DOMU:1.80
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.79 Sat Sep 30 09:03:38 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.79 2017/09/30 09:03:38 pgoyette Exp $
+# $NetBSD: XEN3_DOMU,v 1.80 2017/11/06 02:57:18 rin Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.79 $"
+#ident "XEN3_DOMU-$Revision: 1.80 $"
maxusers 32 # estimated number of users
@@ -98,6 +98,7 @@ file-system TMPFS # Efficient memory fi
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1169 src/sys/arch/i386/conf/GENERIC:1.1170
--- src/sys/arch/i386/conf/GENERIC:1.1169 Mon Oct 23 08:08:53 2017
+++ src/sys/arch/i386/conf/GENERIC Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1169 2017/10/23 08:08:53 skrll Exp $
+# $NetBSD: GENERIC,v 1.1170 2017/11/06 02:57:18 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.1169 $"
+#ident "GENERIC-$Revision: 1.1170 $"
maxusers 64 # estimated number of users
@@ -167,6 +167,7 @@ file-system TMPFS # Efficient memory fi
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
Index: src/sys/arch/i386/conf/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.78 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.79
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.78 Sat Aug 12 06:46:13 2017
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.78 2017/08/12 06:46:13 maxv Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.79 2017/11/06 02:57:18 rin Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -86,6 +86,7 @@ file-system KERNFS # /kern
# File system options
options QUOTA # UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
options FFS_NO_SNAPSHOT # No FFS snapshot support
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.156 src/sys/arch/i386/conf/GENERIC_TINY:1.157
--- src/sys/arch/i386/conf/GENERIC_TINY:1.156 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/GENERIC_TINY Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.156 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: GENERIC_TINY,v 1.157 2017/11/06 02:57:18 rin Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -82,6 +82,7 @@ file-system KERNFS # /kern
# File system options
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
#options NFSSERVER # Network File System server
options FFS_NO_SNAPSHOT # No FF snapshot support
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.42 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.43
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.42 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.42 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.43 2017/11/06 02:57:18 rin Exp $
#
# INSTALL - Installation kernel.
#
@@ -107,6 +107,7 @@ file-system TMPFS # Efficient memory fi
# Filesystem options
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
#options NFSSERVER # Network File System server
options NFS_V2_ONLY # Exclude NFS3 code to save space
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.155 src/sys/arch/i386/conf/INSTALL_TINY:1.156
--- src/sys/arch/i386/conf/INSTALL_TINY:1.155 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/INSTALL_TINY Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.155 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: INSTALL_TINY,v 1.156 2017/11/06 02:57:18 rin Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -93,6 +93,7 @@ file-system MSDOSFS # MS-DOS file syste
# Filesystem options
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
#options NFSSERVER # Network File System server
options NFS_V2_ONLY # Exclude NFS3 code to save space
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.99 src/sys/arch/i386/conf/NET4501:1.100
--- src/sys/arch/i386/conf/NET4501:1.99 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/NET4501 Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.99 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: NET4501,v 1.100 2017/11/06 02:57:18 rin Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.99 $"
+#ident "NET4501-$Revision: 1.100 $"
maxusers 32 # estimated number of users
@@ -106,6 +106,7 @@ file-system PTYFS # /dev/pts/N support
# File system options
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
#options NFSSERVER # Network File System server
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.122 src/sys/arch/i386/conf/XEN3_DOM0:1.123
--- src/sys/arch/i386/conf/XEN3_DOM0:1.122 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.122 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: XEN3_DOM0,v 1.123 2017/11/06 02:57:18 rin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -117,6 +117,7 @@ file-system TMPFS # Efficient memory fi
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.86 src/sys/arch/i386/conf/XEN3_DOMU:1.87
--- src/sys/arch/i386/conf/XEN3_DOMU:1.86 Thu Sep 14 07:58:41 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.86 2017/09/14 07:58:41 mrg Exp $
+# $NetBSD: XEN3_DOMU,v 1.87 2017/11/06 02:57:18 rin Exp $
include "arch/xen/conf/std.xen"
@@ -103,6 +103,7 @@ file-system NILFS # experimental - NTT'
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
#options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
Index: src/sys/arch/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.7 src/sys/arch/riscv/conf/GENERIC:1.8
--- src/sys/arch/riscv/conf/GENERIC:1.7 Thu Sep 14 07:58:43 2017
+++ src/sys/arch/riscv/conf/GENERIC Mon Nov 6 02:57:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.7 2017/09/14 07:58:43 mrg Exp $
+# $NetBSD: GENERIC,v 1.8 2017/11/06 02:57:18 rin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/riscv/conf/std.riscv64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.7 $"
+#ident "GENERIC-$Revision: 1.8 $"
maxusers 64 # estimated number of users
@@ -92,6 +92,7 @@ include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
