diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-19 17:50:44 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-19 17:50:44 +0200 |
| commit | 020465218ccff1195a47a890037db37d0395c9d9 (patch) | |
| tree | 491ffc11553f9de9b91c890f82dc0668c44660e8 /util-linux/mkfs_ext2.c | |
| parent | e329089c62ed813e97344f8c61d7dc34221fd5ee (diff) | |
| parent | 8cd9f343e74ca65f36c42a44e845716ba5411663 (diff) | |
| download | busybox-020465218ccff1195a47a890037db37d0395c9d9.tar.gz | |
Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
Diffstat (limited to 'util-linux/mkfs_ext2.c')
| -rw-r--r-- | util-linux/mkfs_ext2.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index fd54734fc..14feb9288 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -140,7 +140,7 @@ static void PUT(uint64_t off, void *buf, uint32_t size) // only for directories, which never need i_size_high). // // Standard mke2fs creates a filesystem with 256-byte inodes if it is -// bigger than 0.5GB. So far, we do not do this. +// bigger than 0.5GB. // Standard mke2fs 1.41.9: // Usage: mke2fs [-c|-l filename] [-b block-size] [-f fragment-size] @@ -210,17 +210,20 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) // using global "option_mask32" instead of local "opts": // we are register starved here - opt_complementary = "-1:b+:m+:i+"; + opt_complementary = "-1:b+:i+:I+:m+"; /*opts =*/ getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS", - NULL, &bs, NULL, &bpi, &user_inodesize, NULL, NULL, NULL, - &reserved_percent, NULL, NULL, &label, NULL, NULL, NULL, NULL, NULL, NULL); + /*lbfi:*/ NULL, &bs, NULL, &bpi, + /*IJGN:*/ &user_inodesize, NULL, NULL, NULL, + /*mogL:*/ &reserved_percent, NULL, NULL, &label, + /*MOrE:*/ NULL, NULL, NULL, NULL, + /*TU:*/ NULL, NULL); argv += optind; // argv[0] -- device // open the device, check the device is a block device xmove_fd(xopen(argv[0], O_WRONLY), fd); fstat(fd, &st); if (!S_ISBLK(st.st_mode) && !(option_mask32 & OPT_F)) - bb_error_msg_and_die("not a block device"); + bb_error_msg_and_die("%s: not a block device", argv[0]); // check if it is mounted // N.B. what if we format a file? find_mount_point will return false negative since |