Fix mke2fs defaults when /etc/mke2fs.conf doesn't exist

One of our testers filed a bug that said "mkfs.ext3 is much slower
when mke2fs.conf is missing..."

This is because the shipped defaults in mke2fs.conf do not match the
shipped defaults in the mkfs code itself; he wound up making a 1k
block filesystem on a very large block device, for example.

So - How about this patch, to bring them back into line?  Which makes
me wonder; having "defaults" in 2 different places is bound to get out
of sync; should we instead generate both code & config file defaults
(and maybe man page defaults) from a common source?

Anyway, here's a patch to bring mke2fs.conf and mke2fs.c into line for
current defaults...

Signed-off-by: Eric Sandeen <sandeen@redhat.com>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index f459a7cfd6b797de0849dd287a6d13f147750fe8..47748f86d4e218a6b4309818f1ccf9b0d09d6832 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1288,7 +1288,8 @@ static void PRS(int argc, char *argv[])
        tmp = tmp2 = NULL;
        if (fs_param.s_rev_level != EXT2_GOOD_OLD_REV) {
                profile_get_string(profile, "defaults", "base_features", 0,
-                                  "filetype,sparse_super", &tmp);
+                                  "sparse_super,filetype,resize_inode,dir_index",
+                                  &tmp);
                profile_get_string(profile, "fs_types", fs_type, 
                                   "base_features", tmp, &tmp2);
                edit_feature(tmp2, &fs_param.s_feature_compat);
@@ -1365,7 +1366,7 @@ static void PRS(int argc, char *argv[])
        
        if (blocksize <= 0) {
                profile_get_integer(profile, "defaults", "blocksize", 0,
-                                   1024, &use_bsize);
+                                   4096, &use_bsize);
                profile_get_integer(profile, "fs_types", fs_type, 
                                    "blocksize", use_bsize, &use_bsize);