Merge branch 'maint' into next

[tools/e2fsprogs.git] / misc / mke2fs.conf.in

diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
index 0871f77..b7fc95d 100644 (file)
--- a/misc/mke2fs.conf.in
+++ b/misc/mke2fs.conf.in
@@ -1,5 +1,5 @@
 [defaults]
-       base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+       base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
        default_mntopts = acl,user_xattr
        enable_periodic_fsck = 0
        blocksize = 4096
@@ -11,23 +11,14 @@
                features = has_journal
        }
        ext4 = {
-               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-               auto_64-bit_support = 1
-               inode_size = 256
-       }
-       ext4dev = {
-               features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
-               inode_size = 256
-               options = test_fs=1
+               features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
        }
        small = {
                blocksize = 1024
-               inode_size = 128
                inode_ratio = 4096
        }
        floppy = {
                blocksize = 1024
-               inode_size = 128
                inode_ratio = 8192
        }
        big = {
@@ -50,4 +41,5 @@
        hurd = {
             blocksize = 4096
             inode_size = 128
+            warn_y2038_dates = 0
        }