mke2fs: don't complain if the fs type "default" is not defined in mke2fs.conf

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index d15b94cf36bdf9abbf6589051659e8a6f00268d4..b994e1e1bf1731699bb4d1e0aae996d17d4fdc0c 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1059,13 +1059,13 @@ static char **parse_fs_type(const char *fs_type,
                        *t = '\0';
 
                if (*cp) {
-                       if (!profile_has_subsection(profile, "fs_types", cp))
+                       if (profile_has_subsection(profile, "fs_types", cp))
+                               push_string(&list, cp);
+                       else if (strcmp(cp, "default") != 0)
                                fprintf(stderr,
                                        _("\nWarning: the fs_type %s is not "
-                                         "defined in /etc/mke2fs.conf\n\n"),
+                                         "defined in mke2fs.conf\n\n"),
                                        cp);
-                       else
-                               push_string(&list, cp);
                }
                if (t)
                        cp = t+1;

diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index d0b1e124778ba881979218f42a9e96704c98d812..a5b8a9eab37f42012f3b7dfca0cf7180c8dca8d6 100644 (file)
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -3875,7 +3875,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Warning: the fs_type %s is not defined in /etc/mke2fs.conf\n"
+"Warning: the fs_type %s is not defined in mke2fs.conf\n"
 "\n"
 msgstr ""