diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-06-16 20:51:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 20:51:45 +0000 |
| commit | f5a6b34a9a6b3827f3f2cad111bf7eae3f1f034b (patch) | |
| tree | 74f6bd2e24d4ea3841d9dc4eb8c5c2e6f038c0ab /ext4_utils/make_ext4fs.c | |
| parent | aad1accb587aa708012b329c784332dcc9991de6 (diff) | |
| parent | fb0c62963b5fe1b4f36e281c4c02d98d737d08ee (diff) | |
| download | extras-f5a6b34a9a6b3827f3f2cad111bf7eae3f1f034b.tar.gz | |
am fb0c6296: am 9c82554e: Merge "Ignore wipe operation on non-block devices."
* commit 'fb0c62963b5fe1b4f36e281c4c02d98d737d08ee':
Ignore wipe operation on non-block devices.
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index b3de84bd..a4904153 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -627,8 +627,9 @@ int make_ext4fs_internal(int fd, const char *_directory, aux_info.sb->s_blocks_count_lo - aux_info.sb->s_free_blocks_count_lo, aux_info.sb->s_blocks_count_lo); - if (wipe) + if (wipe && WIPE_IS_SUPPORTED) { wipe_block_device(fd, info.len); + } write_ext4_image(fd, gzip, sparse, crc); |