From 0f7479b34048c6cf48a539c411552ef1542ee0b8 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 22 Dec 2010 18:31:36 -0500 Subject: [PATCH] mke2fs: don't complain if the fs type "default" is not defined in mke2fs.conf Signed-off-by: "Theodore Ts'o" --- misc/mke2fs.c | 8 ++++---- po/e2fsprogs.pot | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index d15b94c..b994e1e 100644 --- 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 d0b1e12..a5b8a9e 100644 --- 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 "" -- 1.8.3.1