aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-02-20 21:54:43 -0500
committerTheodore Ts'o <tytso@mit.edu>2011-02-20 21:54:43 -0500
commit214580a339a18b0539b5998d3b47934956a30a1c (patch)
treee32d439027d14735d44372e01450e6d02e9c6447 /tests
parent175d43beada4f5c971fa4b495380620644705282 (diff)
parent855a77a19704ef7e0acd542cce19a6e8ee07582d (diff)
downloade2fsprogs-214580a339a18b0539b5998d3b47934956a30a1c.tar.gz
e2fsprogs-214580a339a18b0539b5998d3b47934956a30a1c.tar.xz
e2fsprogs-214580a339a18b0539b5998d3b47934956a30a1c.zip
Merge branch 'maint' into next
Conflicts: misc/mke2fs.conf.5.in
Diffstat (limited to 'tests')
-rw-r--r--tests/mke2fs.conf.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mke2fs.conf.in b/tests/mke2fs.conf.in
index 99eb75f4..070d5d56 100644
--- a/tests/mke2fs.conf.in
+++ b/tests/mke2fs.conf.in
@@ -3,7 +3,9 @@
blocksize = 4096
inode_size = 256
inode_ratio = 16384
+ enable_periodic_fsck = true
lazy_itable_init = false
+ default_mntopts = ^acl
[fs_types]
ext3 = {