ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkfs.minix: fix size detection 

blkdev_get_size returns size in bytes, so BLOCKS has to be
calculated accordingly.
Use stat value for size if device is not a block device.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
This commit is contained in:
Matthias Koenig 2008-11-06 15:43:46 +01:00 committed by Karel Zak
parent 6ee3f81fae
commit 943add2882
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
disk-utils/mkfs.minix.c
View File

@ -654,9 +654,14 @@ main(int argc, char ** argv) {
die(_("cannot determine sector size for %s"));
if (BLOCK_SIZE < sectorsize)
die(_("block size smaller than physical sector size of %s"));
if (!BLOCKS && blkdev_get_size(DEV, &BLOCKS) == -1)
die(_("cannot determine size of %s"));
if (!BLOCKS) {
if (blkdev_get_size(DEV, &BLOCKS) == -1)
die(_("cannot determine size of %s"));
BLOCKS /= BLOCK_SIZE;
}
} else if (!S_ISBLK(statbuf.st_mode)) {
if (!BLOCKS)
BLOCKS = statbuf.st_size / BLOCK_SIZE;
check=0;
} else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
die(_("will not try to make filesystem on '%s'"));