diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-12-22 19:00:21 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-12-22 19:00:21 -0500 |
| commit | da2a5a4baede2a227d2da587eb74ceae66778fbc (patch) | |
| tree | 5a2e070684ffc2f63873ee24a4b6a499ce9985e6 /misc/mke2fs.c | |
| parent | 9b27e9cc320dd7da24356561b3b12c66f2540432 (diff) | |
| parent | 7267e3d3fdbc911477bfd7fb8bb5232252168d0a (diff) | |
| download | e2fsprogs-da2a5a4baede2a227d2da587eb74ceae66778fbc.tar.gz | |
Merge branch 'maint' into next
Conflicts:
resize/resize2fs.c
Diffstat (limited to 'misc/mke2fs.c')
| -rw-r--r-- | misc/mke2fs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index f453f57f..0ba4a4ce 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1008,13 +1008,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; |