Module Name: src
Committed By: msaitoh
Date: Mon Oct 27 05:37:28 UTC 2014
Modified Files:
src/sys/arch/i386/conf [netbsd-6]: ALL
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1128):
sys/arch/i386/conf/ALL: revision 1.372
Remove FFS_NO_SNAPSHOT from x86/ALL so we do compile the snapshot code.
To generate a diff of this commit:
cvs rdiff -u -r1.332.2.3 -r1.332.2.4 src/sys/arch/i386/conf/ALL
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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.332.2.3 src/sys/arch/i386/conf/ALL:1.332.2.4
--- src/sys/arch/i386/conf/ALL:1.332.2.3 Tue Jun 12 17:47:53 2012
+++ src/sys/arch/i386/conf/ALL Mon Oct 27 05:37:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.332.2.3 2012/06/12 17:47:53 riz Exp $
+# $NetBSD: ALL,v 1.332.2.4 2014/10/27 05:37:28 msaitoh 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.332.2.3 $"
+#ident "ALL-$Revision: 1.332.2.4 $"
maxusers 64 # estimated number of users
@@ -199,7 +199,7 @@ options WAPBL # File system journaling
options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
options UFS_EXTATTR
options NFSSERVER # Network File System server
-options FFS_NO_SNAPSHOT # No FFS snapshot support
+#options FFS_NO_SNAPSHOT # No FFS snapshot support
options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
options V7FS_EI # V7FS Endian Independent support
