diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-18 16:22:26 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-18 16:22:26 +0200 |
commit | 6ae6426a7485b5835c23aea198b3065f491d918b (patch) | |
tree | 79ebcee570986e27d7137720ca3139af277a162b /util-linux | |
parent | b71ce023e9527b6afaa497ce62ca53a74cf94cef (diff) | |
download | busybox-w32-6ae6426a7485b5835c23aea198b3065f491d918b.tar.gz busybox-w32-6ae6426a7485b5835c23aea198b3065f491d918b.tar.bz2 busybox-w32-6ae6426a7485b5835c23aea198b3065f491d918b.zip |
fix mountpoint test to not prevemt mkfs_xxx from making image in any file
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_vfat.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index ca0b17efe..5d1d2af31 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
@@ -374,7 +374,7 @@ static int ask(const char *string, int def) | |||
374 | */ | 374 | */ |
375 | static void check_mount(void) | 375 | static void check_mount(void) |
376 | { | 376 | { |
377 | if (find_mount_point(device_name)) { | 377 | if (find_mount_point(device_name, 0)) { |
378 | int cont; | 378 | int cont; |
379 | #if ENABLE_FEATURE_MTAB_SUPPORT | 379 | #if ENABLE_FEATURE_MTAB_SUPPORT |
380 | /* | 380 | /* |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 18512a395..cf757610b 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -682,7 +682,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) | |||
682 | G.total_blocks = 65535; | 682 | G.total_blocks = 65535; |
683 | 683 | ||
684 | /* Check if it is mounted */ | 684 | /* Check if it is mounted */ |
685 | if (find_mount_point(G.device_name)) | 685 | if (find_mount_point(G.device_name, 0)) |
686 | bb_error_msg_and_die("can't format mounted filesystem"); | 686 | bb_error_msg_and_die("can't format mounted filesystem"); |
687 | 687 | ||
688 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); | 688 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index dff10f9e1..bdd4dd803 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -279,7 +279,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv) | |||
279 | ) | 279 | ) |
280 | bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)"); | 280 | bb_error_msg_and_die("will not try to make filesystem on full-disk device (use -I if wanted)"); |
281 | // can't work on mounted filesystems | 281 | // can't work on mounted filesystems |
282 | if (find_mount_point(device_name)) | 282 | if (find_mount_point(device_name, 0)) |
283 | bb_error_msg_and_die("can't format mounted filesystem"); | 283 | bb_error_msg_and_die("can't format mounted filesystem"); |
284 | #endif | 284 | #endif |
285 | // get true sector size | 285 | // get true sector size |