mke2fs: don't complain if the regular file is too small

Don't ask the user if it's OK that a regular file is smaller than the
requested size.  This test only makes sense if we are creating the
file system on a block device.  This allow users to not need to
manually answer the "proceed?" question when creating a file system
backed by a simple file.

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

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 3c62edead7239251cf60e3d428da5441133364a3..fa61e7b80640dad73e4a9ebef8ae2f7462d61e9e 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1383,7 +1383,7 @@ static void PRS(int argc, char *argv[])
        unsigned long   flex_bg_size = 0;
        double          reserved_ratio = -1.0;
        int             lsector_size = 0, psector_size = 0;
-       int             show_version_only = 0;
+       int             show_version_only = 0, is_device = 0;
        unsigned long long num_inodes = 0; /* unsigned long long to catch too-large input */
        errcode_t       retval;
        char *          oldpath = getenv("PATH");
@@ -1749,7 +1749,7 @@ profile_error:
        if (optind < argc)
                usage();
 
-       if (!check_plausibility(device_name, 0, NULL) && !force)
+       if (!check_plausibility(device_name, 0, &is_device) && !force)
                proceed_question();
 
        check_mount(device_name, force, _("filesystem"));
@@ -1793,7 +1793,7 @@ profile_error:
                                fs_blocks_count &= ~((blk64_t) ((sys_page_size /
                                             EXT2_BLOCK_SIZE(&fs_param))-1));
                }
-       } else if (!force && (fs_blocks_count > dev_size)) {
+       } else if (!force && is_device && (fs_blocks_count > dev_size)) {
                com_err(program_name, 0, "%s",
                        _("Filesystem larger than apparent device size."));
                proceed_question();